Merge branch 'master' into pldi13

[c11tester.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index f9a26768ae7410a9403f3d87bec5d3829bcb0ab9..78006ce2b7ae315957e475b507ba1a5e5693787c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,13 @@
 # generic types
 *.o
 .*.swp
+*.swo
 *.so
 *~
-<<<<<<< HEAD
-=======
-*.*~
->>>>>>> subramanian
+*.dot
 
 # files in this directory
-/model
 /tags
+/doc/docs
+/make.deps
+/benchmarks