Merge gromacs-4-6 into master

[alexxy/gromacs.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9d73631bb3980ac9903572aacb6717e8298955fd..029396348f794c195b26c62eba8fc43ca109583a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ Doxyfile-user
 doxygen-doc
 .project
 .cproject
+CMakeLists.txt.user