X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;h=2086bde2fc77bd92a15ab9ef5a6e8a0d92b9a646;hb=a80d9d228016ea14a30be2c7ef9a952e3ef86869;hp=8145177204f7a0da8da20fb0bca0a1ed12cec37b;hpb=4f16cf51bc8b2aedffb8350582382c1203955335;p=unres.git

diff --git a/.gitignore b/.gitignore
index 8145177..2086bde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,16 @@ cinfo.f
 
 # ignore build dir
 build/
+build2/
+<<<<<<< HEAD
+build_prere/
+period_build/
+period_build2/
+build_*/
+=======
+build_*/
+period_*/
+>>>>>>> master
 
 # latex files in documentation 
 doc/*/*.aux
@@ -22,6 +32,13 @@ 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