small changes

[c11tester.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index f9a26768ae7410a9403f3d87bec5d3829bcb0ab9..8df986236c0ce4c60c181b23194f9db1b1d879f3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,15 @@
 # generic types
 *.o
-.*.swp
+*.swp
+*.swo
 *.so
 *~
-<<<<<<< HEAD
-=======
-*.*~
->>>>>>> subramanian
+*.dot
+.*.d
+*.pdf
 
 # files in this directory
-/model
 /tags
+/doc/docs
+/benchmarks
+/README.html