Merge branch 'develop' into multithread

This commit is contained in:
Matt Hill
2014-02-20 18:34:23 -06:00

5
.gitignore vendored
View File

@@ -6,3 +6,8 @@ CMakeFiles/
CMakeCache.txt CMakeCache.txt
.o .o
benchmarks/ benchmarks/
.kdev/
*.kdev4
website/
utilities/
samples/