diff --git a/.gitignore b/.gitignore index 04e0326717923354514c79ec68f3d647d79dbe9c..3a6cdc5860250bb07bd16a31bd15f448949632c5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,10 @@ # Ignore text editor (e.g. emacs) autosave files *~ - +# ignore internal gitignore +*/test/.gitignore +/Code/Mantid/*/*/test/.gitignore +Win64/ # Ignore CMake generated files (if someone does an in-source build) CMakeCache.txt @@ -45,6 +48,8 @@ local.properties .classpath .settings/ .loadpath +*.vcxproj +*.filters # External tool builders .externalToolBuilders/ @@ -60,8 +65,8 @@ local.properties ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. -*.filters -*.vcxproj +*.sln +*.vcproj *.exe # User-specific files @@ -158,5 +163,3 @@ Desktop.ini # Mac OS X Finder .DS_Store - -