X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;h=2086bde2fc77bd92a15ab9ef5a6e8a0d92b9a646;hb=9a54ab407f6d0d9d564d52763b3e2136450b9ffc;hp=b25ea145c5be19c9ea9c8811986f4d0f1b9aab17;hpb=3e2116f1c3c9f9db1f8f34ea327e064df9345d67;p=unres.git

diff --git a/.gitignore b/.gitignore
index b25ea14..2086bde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # ignore compiled stuff
 *.[oa]
+cinfo.f
 
 # ignore texteditors
 *.swp
@@ -11,6 +12,20 @@
 # 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/
@@ -19,5 +34,11 @@ run/
 sympcheck/
 bin/unres/MD/unres_ifort_MPICH_GAB_czyt.exe
 bin/unres/MD-M/unres_Tc_procor_newparm_em64-D-symetr.exe
-DIL
+DIL/
 compinfo
+period_build
+build_devel
+build_theta
+build_new
+build_prere/
+period_build2