X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;h=d0edd88695873d673fdd9741775c21ebb7d6ab5a;hb=d710d4c1f1891644fe111ef6d6b3e5e82c067c1b;hp=abb36400389eaae108e551739f6ec0c198a094dd;hpb=ac32b72e6bb48e2caacd7fb88a270089889b2ef5;p=unres.git

diff --git a/.gitignore b/.gitignore
index abb3640..d0edd88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,35 @@
-<<<<<<< HEAD
 # ignore compiled stuff
 *.[oa]
+cinfo.f
 
 # 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/
-=======
-~.[ao]
+build2/
+
+# latex files in documentation 
+doc/*/*.aux
+doc/*/*.log
+
+
+# ignored dirs form adasko
 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
+period_build
+build_devel
+build_theta
+build_new
+build_prere/
+period_build2