# ignore compiled stuff
*.[oa]
+cinfo.f
# ignore texteditors
*.swp
# 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/
run/
sympcheck/
bin/unres/MD/unres_ifort_MPICH_GAB_czyt.exe
-DIL
+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