[X2Go-Commits] [vcxsrv] 01/17: Update README.md about new branch names

git-admin at x2go.org git-admin at x2go.org
Sun Mar 29 16:07:23 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/1.15.2.x
in repository vcxsrv.

commit 4b0025d2dcb480867eef735704e5ffb93d712195
Author: Mike DePaulo <mikedep333 at users.noreply.github.com>
Date:   Sat Mar 28 11:36:47 2015 -0400

    Update README.md about new branch names
    
    These branch names are based on the X2Go convention for branch names.
---
 README.md |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1d4e4f7..015a3be 100644
--- a/README.md
+++ b/README.md
@@ -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`.

--
Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git


More information about the x2go-commits mailing list