diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2012-07-27 19:46:56 +0400 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2012-07-27 19:46:56 +0400 |
| commit | fc861487f76b743b7d249b7848474208c2facfa2 (patch) | |
| tree | 363a1be073627aa3d9bdae743851fd927fc2756b /.gitignore | |
| parent | e77ed9bc6afdfc6a6e5fc18fb298df0ae27cbcb3 (diff) | |
| parent | 1e6ee83e065856c6545a91b902b1cc26c82ce68d (diff) | |
Merge branch 'master' into ui-refresh
Conflicts:
version-checks
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 93f2f6535f..601e78f575 100644 --- a/.gitignore +++ b/.gitignore @@ -118,6 +118,7 @@ main/external/Makefile /main/src/addins/NUnit/NUnitRunner/Makefile /main/src/addins/TextTemplating/Makefile /main/src/addins/TextTemplating/Mono.TextTemplating/Makefile +/main/src/addins/TextTemplating/Mono.TextTemplating.Tests/Makefile /main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Makefile /main/src/addins/TextTemplating/TextTransform/Makefile /main/src/addins/VBNetBinding/Makefile @@ -144,7 +145,10 @@ main/external/Makefile /main/src/tools/MacCrashLogger/Makefile /main/src/tools/mdcrashlog/Makefile /main/tests/Makefile +/main/tests/MacPlatform.Tests/Makefile +/main/tests/MonoDevelop.MacDev.Tests/Makefile /main/tests/UnitTests/Makefile +/main/tests/UserInterfaceTests/Makefile /main/theme-icons/Makefile /main/contrib/NGit/Makefile /main/contrib/NSch/Makefile |