diff options
| author | Alan McGovern <alan@xamarin.com> | 2012-11-21 19:55:53 +0400 |
|---|---|---|
| committer | Alan McGovern <alan@xamarin.com> | 2012-11-21 19:55:53 +0400 |
| commit | e9f3c966895341fe3864485448b81be6d7d6d0e8 (patch) | |
| tree | 21d5a02344d497bc5a12f28782746fa0308989e9 /.gitmodules | |
| parent | 8fab7d02416374b4ec5dd3496500bc7c5c4425d6 (diff) | |
| parent | dd32d110e19443c9d5d5ee6d80f9ac35d5ccf805 (diff) | |
Merge branch 'master' into ui-refresh
Conflicts:
.gitmodules
main/external/ikvmfork
main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs
main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 90a1372846..884e319e2e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,6 +28,6 @@ [submodule "main/external/mono-addins"] path = main/external/mono-addins url = git://github.com/mono/mono-addins.git -[submodule "main/external/ikvmfork"] - path = main/external/ikvmfork - url = git://github.com/mono/ikvm.git +[submodule "main/external/ikvm"] + path = main/external/ikvm + url = git://github.com/mono/ikvm-fork.git |