diff options
| author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-07-15 17:08:48 +0300 |
|---|---|---|
| committer | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-07-15 17:08:48 +0300 |
| commit | 3a0ce14f6db807577f9384310dc29a763b9dd243 (patch) | |
| tree | eeeea2e1e36a4d9cc08ed24a08c4d79666a661bd /.gitmodules | |
| parent | f979170edbce6e7583e4af01f2d13f5ac529eaa5 (diff) | |
| parent | 5bdb4d5486784ad2fdcd0bcf09b7cac45dd8d072 (diff) | |
Merge remote-tracking branch 'origin/master' into roslyn
Conflicts:
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StatusProgressMonitor.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 0cfa6fdd35..2cca62b1a3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,7 +34,7 @@ [submodule "main/external/xwt"] path = main/external/xwt url = git://github.com/mono/xwt - branch = image-loader + branch = master [submodule "main/external/monomac"] path = main/external/monomac url = git://github.com/mono/monomac.git |