X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;h=8c2fb891e46023b17de05aa042570755c49ceeab;hb=refs%2Fheads%2Fdevel;hp=4c3f4f264ccb91d85ada8e01dbe24581ce985a01;hpb=3a261ae36be53eb4fadc9f30179cebb122b5b280;p=unres.git

diff --git a/.gitignore b/.gitignore
index 4c3f4f2..8c2fb89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,33 @@
-<<<<<<< HEAD
-*.[oa] 
-*~
-*.swp
-*.[eo][0-9][0-9][0-9][0-9]*
-=======
 # ignore compiled stuff
 *.[oa]
+cinfo.f
+*.exe
 
 # ignore texteditors
 *.swp
 *~
 
+# ignore PBS output and error files
+*.[eo][0-9][0-9][0-9][0-9]*
 
 # ignore build dir
 build/
+build2/
+build_prere/
+period_build/
+period_build2/
+build_*/
+
+# latex files in documentation 
+doc/*/*.aux
+doc/*/*.log
+
 
 # ignored dirs form adasko
 gradcheck/
 mapcheck/
+build*/
+period*/
 run/
 sympcheck/
-
->>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
+compinfo