diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2012-11-05 11:26:46 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2012-11-05 11:26:46 +0400 |
| commit | 2014afd3141da2d6d45fa0aa85893e5b1bef9cab (patch) | |
| tree | 960b53163b18bf9c090afd467d77b387180b7f6c /.gitmodules | |
| parent | 46b40d6ce4f239bd45c581633cf8e945d02c41f4 (diff) | |
| parent | b34e289a45b686fc4481cc3a22eb3011e38edea1 (diff) | |
Merge branch 'master' into ui-refresh
Conflicts:
main/Main.sln
main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 4ec4f4e11d..c69107509a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule "main/external/mono-addins"] path = main/external/mono-addins url = git://github.com/mono/mono-addins.git +[submodule "main/external/ikvm"] + path = main/external/ikvm + url = git://github.com/gluck/ikvm.git |