Merge commit '6b56fbddbeb231f28fd11c08c88dd4ef95db8f93' into milek-dev

This commit is contained in:
milek7
2019-03-16 21:08:25 +01:00
6 changed files with 208 additions and 27 deletions

11
.gitignore vendored
View File

@@ -54,8 +54,8 @@ install_manifest.txt
*.~pas
*.opensdf
*.sdf
#*.sln
#*.vcxproj
*.sln
*.vcxproj
*.filters
format_all_files.py
*.suo
@@ -71,10 +71,5 @@ ipch/
*.aps
builds/
doc/
CMakeLists.txt.user
*.vcxproj
*.sln
CMakeLists.txt.user