diff --git a/Abgabe/presentation.md b/Abgabe/presentation.md deleted file mode 100644 index 4649bb3..0000000 --- a/Abgabe/presentation.md +++ /dev/null @@ -1,3 +0,0 @@ -# Presentation Links - -- 0.3 https://prezi.com/view/M593VBJhmfwQzuqt3t6f/ diff --git a/README.md b/README.md index 57db251..69598fe 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,22 @@ # IntelliPhoto -For the user manual see docs/manual.pdf \ No newline at end of file +For the user manual see `docs/manual.pdf` + +## Content + +- `src` - Source Code +- `docs` - Documentation of the source code and user manual +- `Examples` - Temporary folder for example pictures +- `Abgabe` - Files that were submitted + +## Pesentations + +- 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 + +Every Thursday dev and master will be merged and tagged with the current version.