projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
threads: correct 'swap()' documentation
[model-checker.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index f9a26768ae7410a9403f3d87bec5d3829bcb0ab9..07fe7eb943f3fbc9824f51f2d177c16863da7d78 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,13
+1,11
@@
# generic types
*.o
.*.swp
+*.swo
*.so
*~
-<<<<<<< HEAD
-=======
-*.*~
->>>>>>> subramanian
# files in this directory
/model
/tags
+/docs