projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NIE PEWNE ZMIANY ZWERYFIKUJ!!
[unres.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
abb3640
..
77eb558
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,4
+1,3
@@
-<<<<<<< HEAD
# ignore compiled stuff
*.[oa]
# ignore compiled stuff
*.[oa]
@@
-6,14
+5,18
@@
*.swp
*~
*.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]
+
+# ignored dirs form adasko
gradcheck/
mapcheck/
run/
sympcheck/
gradcheck/
mapcheck/
run/
sympcheck/
->>>>>>> adasko
-
+bin/unres/MD/unres_ifort_MPICH_GAB_czyt.exe
+bin/unres/MD-M/unres_Tc_procor_newparm_em64-D-symetr.exe
+DIL
+compinfo