9
1
mirror of https://github.com/QuantumPackage/qp2.git synced 2024-12-21 19:13:29 +01:00

Merge branch 'develop' of github.com:QuantumPackage/qp2 into develop

This commit is contained in:
Anthony Scemama 2019-03-07 15:21:31 +01:00
commit 5ae479bc8c

View File

@ -1,22 +1,22 @@
GitHub Branches GitHub Branches
=============== ===============
master master:
The current up-to-date working branch, that users download It should The current up-to-date working branch, that users download It should
only contain the latest release and bug fixes. only contain the latest release and bug fixes.
develop-toto develop-lcpq:
Toulouse development branch Toulouse development branch
develop-manus develop-lct:
Parise development branch Paris development branch
develop develop:
It is a fork of the *master* branch with new developments that will be 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 merged in the *master* branch for the next release. Other development
branches should be merged on this one. branches should be merged on this one.
gh-pages gh-pages:
This is an independent branch, containing only the web site of QP2. This is an independent branch, containing only the web site of QP2.