Merge branch 'dev' into develop

Conflicts: .gitignore

Merge branch 'dev' into develop
Conflicts: .gitignore
01ed9f51 · thomas · fa461dc7 · e3f563b2 · 01ed9f51
Commit 01ed9f51 authored Feb 20, 2015 by thomas
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

.gitignore .gitignore +3 -3

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,6 @@ CMakeLists.txt.user
 bin/
 ThirdParty/bin/
 SCHNApps/bin
-build/
-ThirdParty/build/
-ThirdParty/include/TinyXml2/
+build
+ThirdParty/include/TinyXml2
+