diff options
| author | Matt Ward <matt.ward@xamarin.com> | 2015-08-26 13:27:14 +0300 |
|---|---|---|
| committer | Matt Ward <matt.ward@xamarin.com> | 2015-08-26 13:27:14 +0300 |
| commit | 6d722d8112b6fab2585a23bce45340b3ea10a8f0 (patch) | |
| tree | 11398c3339dce18ab46bedbde19c12a04210fd43 /.gitmodules | |
| parent | da2f0250a29ed436543624e814123302225c510c (diff) | |
| parent | 2e2d15ac59daf1079c5e3912307875521c45d7f6 (diff) | |
Merge branch 'master' into roslyn
Conflicts:
.gitmodules
main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/CheckForUpdatesProgressMonitor.cs
main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageUpdatesEventMonitor.cs
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 8f4133dfde..1db437ebe6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -43,15 +43,15 @@ url = git://github.com/mono/sharpsvn-binary.git [submodule "main/external/libgit2sharp"] path = main/external/libgit2sharp - url = git://github.com/libgit2/libgit2sharp.git - branch = xs-5.10-v1 + url = git://github.com/mono/libgit2sharp.git + branch = xs-5.10-v2 [submodule "main/external/libgit-binary"] path = main/external/libgit-binary url = git://github.com/mono/libgit-binary.git [submodule "main/external/libgit2"] path = main/external/libgit2 url = git://github.com/mono/libgit2.git - branch = xs-5.10-v1 + branch = xs-5.10-v2 [submodule "main/external/RefactoringEssentials"] path = main/external/RefactoringEssentials url = git://github.com/icsharpcode/RefactoringEssentials.git |