Merge branch 'release/2.2.2' into develop

This commit is contained in:
Janek Bevendorff
2017-10-19 21:45:49 +02:00
17 changed files with 306 additions and 35 deletions

1
.gitignore vendored
View File

@@ -1,5 +1,6 @@
CMakeLists.txt.*
build*/
cmake-build-*/
release*/
.idea/
*.iml