Changes between Version 7 and Version 8 of QtWebKitGitInstructions

Timestamp:

Apr 14, 2009, 4:54:41 AM (16 years ago)

Author:

Simon Hausmann

Comment:

--

QtWebKitGitInstructions

@@ -4 +4 @@
 
  * svn/master: This is the main development line, mirrored straight from SVN trunk. We do our development in trunk.
- * qtwebkit-4.5: This branch, based on trunk, contains what we're going to ship with Qt 4.5. No direct development happens in this branch, we only merge from trunk or branches that are scheduled for inclusion into trunk.
+ * qtwebkit-4.5: This branch, based on trunk, contains what we're shipping in Qt 4.5. No direct development happens in this branch, we only merge from trunk or branches that are scheduled for inclusion into trunk.
  * shared/* : Everybody can create/delete/change branches that start with "shared/".
  * <username>/* : This is where developers publish their changes. You can have as many so-called topic branches as you like. For example holger/crash-fix would be a name for such a topic branch.
  * svn/* such as svn/master or svn/Safari-3-branch. The branches prefixed with svn/ are read-only
    and are mirrored from the WebKit Subversion repository.
- * qtwebkit: This is the old development branch that contains what is shipped with Qt 4.4.
 
 = Howto =