diff options
| author | David Karlaš <david.karlas@xamarin.com> | 2015-07-14 12:34:24 +0300 |
|---|---|---|
| committer | David Karlaš <david.karlas@xamarin.com> | 2015-07-14 12:34:24 +0300 |
| commit | 0a5d95a1f3c71c826b1199425e2f4a6668832f53 (patch) | |
| tree | 48d7a59fb4156f0df26c969136962888e79dbfe8 /.gitmodules | |
| parent | 91ffd0f35b73d316533068f48690cd5d23fd471c (diff) | |
| parent | a7935660bde3c52a8a688e81087d90ae3e1d89c6 (diff) | |
Merge branch 'master' into roslyn
Conflicts:
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionWindowManager.cs
version-checks
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 2cca62b1a3..0cfa6fdd35 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,7 +34,7 @@ [submodule "main/external/xwt"] path = main/external/xwt url = git://github.com/mono/xwt - branch = master + branch = image-loader [submodule "main/external/monomac"] path = main/external/monomac url = git://github.com/mono/monomac.git |