X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;h=2086bde2fc77bd92a15ab9ef5a6e8a0d92b9a646;hb=c6588e178e83ce42d404f65fecf3dc0aa71764c5;hp=5e03956ed5e4b5e72e434521de7c71407a084009;hpb=15a1ab6260ac7b7159b386449312cecb0775153c;p=unres.git

diff --git a/.gitignore b/.gitignore
index 5e03956..2086bde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # ignore compiled stuff
 *.[oa]
+cinfo.f
 
 # ignore texteditors
 *.swp
@@ -10,12 +11,34 @@
 
 # ignore build dir
 build/
+build2/
+<<<<<<< HEAD
+build_prere/
+period_build/
+period_build2/
+build_*/
+=======
+build_*/
+period_*/
+>>>>>>> master
+
+# latex files in documentation 
+doc/*/*.aux
+doc/*/*.log
+
 
 # ignored dirs form adasko
 gradcheck/
 mapcheck/
 run/
 sympcheck/
-compinfo
-DIL/
 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