Minor README update

This commit is contained in:
2019-12-18 14:36:59 +01:00
parent 7444455094
commit a2a44cefaa

View File

@@ -7,16 +7,17 @@ For the user manual see `docs/manual.pdf`
- `src` - Source Code
- `docs` - Documentation of the source code and user manual
- `Examples` - Temporary folder for example pictures
- `Abgabe` - Files that were submitted
- `Abgabe` - Files that were submitted prior to the development start
## Pesentations
- 0.3 https://prezi.com/view/M593VBJhmfwQzuqt3t6f/
- since `0.3`: https://prezi.com/view/M593VBJhmfwQzuqt3t6f/
## Branching
- `master` branch: current state of the program, pull requests only by maintainers or developers
- `dev` branch: state of development for next week, will be merged every Thursday, pushable for maintainers, pull requests for everyone
- `dev-X` branches: feature development branches which will be merged into dev, when tested
- `hotfix-X` branches: braches to fix small but important bugs, will be merged into master and dev
Every Thursday dev and master will be merged and tagged with the current version.
On Thursday the development state (`dev`) will be merged into master and tagged with the current version.