diff options
| author | Mike DePaulo <mikedep333@users.noreply.github.com> | 2015-03-28 11:36:47 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-05-09 19:45:52 -0400 |
| commit | 92a3547b90985e069e390f062efbef89da44b759 (patch) | |
| tree | 485508aebd04f823b0ff2b306293cc2e77e76521 | |
| parent | 9ec6c06924b7d3fde7862116a823f2111330b889 (diff) | |
| download | vcxsrv-92a3547b90985e069e390f062efbef89da44b759.tar.gz vcxsrv-92a3547b90985e069e390f062efbef89da44b759.tar.bz2 vcxsrv-92a3547b90985e069e390f062efbef89da44b759.zip | |
Update README.md about new branch names
These branch names are based on the X2Go convention for branch names.
| -rw-r--r-- | README.md | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -54,6 +54,6 @@ You might be wondering why this repo and these builds exist. Why not upstream yo #### Explanation of branches: 1. master - The upstream VcXsrv branch that upstream VcXsrv is built from. Currently on the 1.16.x version series. -2. 1.15.2.x - the 1.15.2.x branch maintained by Arctica and X2Go. -3. released - Upstream copies the released (or git) versions of the various packages into the released branch (and updates the packages.txt file at the root.) This branch contains 0 modifications to those packages. Upstream then uses git's merge feature to merge these packages updates/upgrades packages into master, where upstream does make modifications to those packages. -4. released-1.15.2.x - same as released, but for 1.15.2.x rather than master. +2. release/1.15.2.x - the 1.15.2.x branch maintained by Arctica and X2Go. +3. release/external - Upstream copies the released (or git) versions of the various packages into this branch, which they call `released` . They then update the packages.txt file at the root. This branch contains 0 modifications to those packages. Upstream then uses git's merge feature to merge these packages updates/upgrades into master, where upstream does make modifications to those packages. +4. release/external-1.15.2.x - same as `release/external`, but for `release/1.15.2.x` rather than `master`. |