Merge branch 'master' into Microsoft/master

This commit is contained in:
Matt Newport 2015-10-19 18:56:46 -07:00
commit ea47e04b73

12
.gitignore vendored
View File

@ -1 +1,13 @@
tests/unittest-cpp tests/unittest-cpp
CMakeFiles
tests/CMakeFiles
tests/Debug
*.opensdf
*.sdf
tests/*tests.dir
*.vcxproj
*.vcxproj.filters
*.sln
*.tlog
Testing/Temporary/*.*
CMakeCache.txt