projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mymemory: define SNAPSHOTALLOC appropriately
[model-checker.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index f9a26768ae7410a9403f3d87bec5d3829bcb0ab9..c344192e488e2be80a85ddfd5d68767373a37deb 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,13
+1,12
@@
# generic types
*.o
.*.swp
# generic types
*.o
.*.swp
+*.swo
*.so
*~
*.so
*~
-<<<<<<< HEAD
-=======
-*.*~
->>>>>>> subramanian
+*.dot
# files in this directory
# files in this directory
-/model
/tags
/tags
+/doc/docs
+/make.deps