creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-12 19:40:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update README.md

Browse Source
This commit is contained in:
Conrad
2020-02-07 19:31:35 +01:00
parent 2f2d7ff3a8
commit 7f79f574c6
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@@ -5,18 +5,16 @@ For the user manual see `docs/manual.pdf`
## Content ## Content
- `src` - Source Code - `src` - Source Code
- `docs` - Documentation of the source code and user manual - `docs` - Documentation of the source code/ reference (`docs/html/index.html`, EN) and user manual (`docs/Benutzerhandbuch.pdf`, DE) and developer manual (`docs/Entwicklerhandbuch.pdf`)
- `Abgabe` - Files that were submitted prior to the development start - `Abgabe` - Files that were submitted prior to the development start
## Presentations and Changelog ## Presentations and Changelog
- since `0.3`: https://prezi.com/view/M593VBJhmfwQzuqt3t6f/ - since `0.3`: https://prezi.com/view/M593VBJhmfwQzuqt3t6f/
## Branching ## Build Guide
- `master` branch: current state of the program, pull requests only by maintainers or developers - Make sure the requirements (QT version 5.14.1) are installed correctly
- `dev` branch: state of development for next week, will be merged every Thursday, pushable for maintainers, pull requests for everyone - Open the project file (`src/IntelliPhoto.pro`) in QT Creator
- `dev-X` branches: feature development branches which will be merged into dev, when tested - Select the correct build kit for your operating system
- `hotfix-X` branches: braches to fix small but important bugs, will be merged into master and dev - Run the code in release mode
On Thursday the development state (`dev`) will be merged into master and tagged with the current version.