-<<<<<<< HEAD
# ignore compiled stuff
*.[oa]
+cinfo.f
+*.exe
# ignore texteditors
*.swp
*~
+# ignore PBS output and error files
+*.[eo][0-9][0-9][0-9][0-9]*
-# ifnore build dir
+# ignore build dir
build/
-=======
-~.[ao]
+build2/
+build_prere/
+period_build/
+period_build2/
+build_*/
+
+# latex files in documentation
+doc/*/*.aux
+doc/*/*.log
+
+
+# ignored dirs form adasko
gradcheck/
mapcheck/
+build*/
+period*/
run/
sympcheck/
->>>>>>> adasko
-
+compinfo