Merge branch 'dev-gtest' into dev

[libcds.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ac4f212f826fdbc7da3a017a2fae14111ead3bde..6107723e45a0be82f47bee20911974dd240b2efd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,21 @@
-/tools/doxygen.log
 /doc
+/sandbox
+/projects/Win/vc12/cds.opensdf
+/projects/Win/vc12/cds.sdf
+/projects/Win/vc12/cds.v12.suo
+/tests/cppunit/*.o
+*.o
+*.d
+/tests/data/dictionary.txt
+/bin
+/obj
+/projects/Win/vc12/*.user
+/projects/Win/vc14/cds.sdf
+/projects/Win/vc14/cds.v14.suo
+/projects/Win/vc14/*.user
+/projects/Win/vc14/*.opensdf
+/projects/Win/vc14/.vs/
+/todo-2.1.txt
+*.log
+/.project
+/projects/Win/vc14/*.opendb