diff --git a/GITHUB.md b/GITHUB.md index 054d420c..02836a37 100644 --- a/GITHUB.md +++ b/GITHUB.md @@ -1,22 +1,22 @@ GitHub Branches =============== -master +master: The current up-to-date working branch, that users download It should only contain the latest release and bug fixes. -develop-toto +develop-lcpq: Toulouse development branch -develop-manus - Parise development branch +develop-lct: + Paris development branch -develop +develop: It is a fork of the *master* branch with new developments that will be merged in the *master* branch for the next release. Other development branches should be merged on this one. -gh-pages +gh-pages: This is an independent branch, containing only the web site of QP2.