X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;h=2086bde2fc77bd92a15ab9ef5a6e8a0d92b9a646;hb=325eda160c9ad2982501e091ca40606a29043712;hp=45bb90543eeab668fcb52d84ad43b6a8e021b435;hpb=bb1f52b9a8418d7c9773696e6eb0d3c6809931b4;p=unres.git

diff --git a/.gitignore b/.gitignore
index 45bb905..2086bde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,44 @@
-*.[oa] 
-*~
+# ignore compiled stuff
+*.[oa]
+cinfo.f
+
+# ignore texteditors
 *.swp
+*~
+
+# ignore PBS output and error files
 *.[eo][0-9][0-9][0-9][0-9]*
+
+# 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/
+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