-<<<<<<< HEAD
-*.[oa]
-*~
-*.swp
-*.[eo][0-9][0-9][0-9][0-9]*
-=======
# 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/
+build_prere/
+period_build/
+period_build2/
+build_*/
+
+# latex files in documentation
+doc/*/*.aux
+doc/*/*.log
+
# ignored dirs form adasko
gradcheck/
mapcheck/
run/
sympcheck/
-
->>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
+bin/unres/MD/unres_ifort_MPICH_GAB_czyt.exe
+bin/unres/MD-M/unres_Tc_procor_newparm_em64-D-symetr.exe
+DIL/
+compinfo