projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ss_dyn compiles with make and with cmake
[unres.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
abb3640
..
8145177
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,19
+1,27
@@
-<<<<<<< HEAD
# ignore compiled stuff
*.[oa]
# ignore compiled stuff
*.[oa]
+cinfo.f
# ignore texteditors
*.swp
*~
# ignore texteditors
*.swp
*~
+# ignore PBS output and error files
+*.[eo][0-9][0-9][0-9][0-9]*
-# ifnore build dir
+# ignore build dir
build/
build/
-=======
-~.[ao]
+
+# latex files in documentation
+doc/*/*.aux
+doc/*/*.log
+
+
+# ignored dirs form adasko
gradcheck/
mapcheck/
run/
sympcheck/
gradcheck/
mapcheck/
run/
sympcheck/
->>>>>>> adasko
-
+compinfo
+DIL/
+bin/unres/MD/unres_ifort_MPICH_GAB_czyt.exe