X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=.gitignore;h=2086bde2fc77bd92a15ab9ef5a6e8a0d92b9a646;hb=048c372bb0410b9bd2fa626f947866b0a07d20f8;hp=bac46173eb81b42d45a1ded9c18d34ca401f1ce5;hpb=e7fd0c7782f6f624b41009800df8e3d5e0e9add5;p=unres.git

diff --git a/.gitignore b/.gitignore
index bac4617..2086bde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,44 @@
+# 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