diff options
| author | VoidAtValhalla <VoidAtValhalla@users.noreply.github.com> | 2014-03-18 22:05:36 +0100 |
|---|---|---|
| committer | VoidAtValhalla <VoidAtValhalla@users.noreply.github.com> | 2014-03-18 22:05:36 +0100 |
| commit | 5bd81e8d384e82926a7671527e62aebafed1183f (patch) | |
| tree | 4f9514704704c34440c521edcc28a1ade5f8fe0c | |
| parent | 9724889d1f260e41e0b501a1cdaeb497a2d0d9ac (diff) | |
| parent | c522d625b0e649113cd7e6d4603fc652d828a4c5 (diff) | |
| download | bemenu-5bd81e8d384e82926a7671527e62aebafed1183f.tar.gz bemenu-5bd81e8d384e82926a7671527e62aebafed1183f.tar.bz2 bemenu-5bd81e8d384e82926a7671527e62aebafed1183f.zip | |
Merge branch 'dev/readme' into develop
| -rw-r--r-- | README.md | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -18,3 +18,10 @@ Dynamic menu library and client program inspired by dmenu * **Build system** - [CMake](http://www.cmake.org/) * **API documentation** - [Doxygen](http://www.stack.nl/~dimitri/doxygen/index.html) (JavaDoc style comments) +* **Branches** + * **master** - stable releases (permanent) + * **develop** - development (permanent), merge back to **master** + * **dev/topic** - topic related development (temporary), branch off from + **develop** and merge to **develop** + * **hotfix/issue** - stable release bugfixes (temporary), branch off from + **master** and merge to **master** and **develop** |