Commit 01ed9f51 authored by thomas's avatar thomas
Browse files

Merge branch 'dev' into develop

Conflicts:
	.gitignore
parents fa461dc7 e3f563b2
...@@ -3,6 +3,6 @@ CMakeLists.txt.user ...@@ -3,6 +3,6 @@ CMakeLists.txt.user
bin/ bin/
ThirdParty/bin/ ThirdParty/bin/
SCHNApps/bin SCHNApps/bin
build/ build
ThirdParty/build/ ThirdParty/include/TinyXml2
ThirdParty/include/TinyXml2/
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment