Merge branch 'marjut' into 'master'

cotire See merge request !1

Merge branch 'marjut' into 'master'
dddb674d · Oliver Kirsebom · fc0a62f5 · 2042537d · dddb674d · dddb674d
Commit dddb674d authored 8 years ago by Oliver Kirsebom
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@ cmake_install.cmake
 install_manifest.txt

 #Cotire
-*cotire.cmake
 cotire/*
 analysis/cotire/*


--- a/cmake/cotire.cmake
+++ b/cmake/cotire.cmake