diff options
author | Aaron Bockover <abock@xamarin.com> | 2014-06-03 20:50:52 +0400 |
---|---|---|
committer | Aaron Bockover <abock@xamarin.com> | 2014-06-03 20:50:52 +0400 |
commit | 7bb27a9d6b6f6ad4704f4516b5f59f254df0e4a4 (patch) | |
tree | 83f1a2f9bc813cf45c26d0814f55897d6de33309 /.gitmodules | |
parent | 019e82448e686a25d2d711664ff59874a5142a7b (diff) | |
parent | 306c00e9c3ad3a1725ab54ff064d9fe79e93e368 (diff) |
Merge branch 'xammac-2.0' of github.com:xamarin/monodevelop into xammac-2.0
Conflicts:
.gitmodules
Diffstat (limited to '.gitmodules')
-rw-r--r-- | .gitmodules | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 04a854d097..f02209311f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,9 +5,6 @@ [submodule "main/external/mono-tools"] path = main/external/mono-tools url = git://github.com/mono/mono-tools.git -[submodule "main/external/monomac"] - path = main/external/monomac - url = git://github.com/mono/monomac.git [submodule "main/external/ngit"] path = main/external/ngit url = git://github.com/mono/ngit.git |