diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2014-06-24 01:41:39 +0400 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2014-06-24 01:41:39 +0400 |
| commit | dbec3c6040bfd8e9f1a1eecaa499233b722ef4bb (patch) | |
| tree | 2912ffb0f439056ba11df4efbf5caa1fe5b907b7 /.gitignore | |
| parent | 649c93f8e295c02cdd45811bdb0000ccb331ed31 (diff) | |
| parent | f9a6e0197d02d82793c5dde0576f51943a7eedd4 (diff) | |
Merge branch 'master' into xammac-2.0
Conflicts:
main/external/xwt
version-checks
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index c13b5efb65..420ae1da9d 100644 --- a/.gitignore +++ b/.gitignore @@ -99,7 +99,6 @@ main/external/Makefile /main/src/addins/GnomePlatform/Makefile /main/src/addins/ILAsmBinding/Makefile /main/src/addins/MacPlatform/Makefile -/main/src/addins/MonoDevelop.MacDev/Makefile /main/src/addins/Makefile /main/src/addins/MonoDevelop.AssemblyBrowser/Makefile /main/src/addins/MonoDevelop.Autotools/Makefile @@ -165,7 +164,6 @@ main/external/Makefile /main/tests/Ide.Tests/Makefile /main/tests/Makefile /main/tests/MacPlatform.Tests/Makefile -/main/tests/MonoDevelop.MacDev.Tests/Makefile /main/tests/TestRunner/Makefile /main/tests/UnitTests/Makefile /main/tests/UserInterfaceTests/Makefile |