Update README

frogsystem · Dec 14, 2014 · 088d482 · 088d482
1 parent c689669
commit 088d482
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/README b/README
@@ -1,10 +1,11 @@
-Development branches:
-
-  - alix6-bugfixes: This is the branch with bug-fixes for alix6. Use this a base of your development for alix6.
-  - alix6_neu:      This is the base branch of alix6. bugfixes will be merged into it, if occur.
+Master branch:
   - master:         This will always be the branch of the latest release. After a new release the
                     specific branch will be merged into this one.
 
+Development branches:
+
+  - alix7:          This is the current development branch for the next version alix7.
+
 Test branches:
 
   - future:   This branch is for testing purposes only. I use it to test some long-distance changes.