diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2014-04-04 20:38:30 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2014-04-04 20:38:30 +0400 |
| commit | cdab0bdf64ae9447ccf554bfbc1c2dff92f09a65 (patch) | |
| tree | e33eb4b2067ffd192c2ac82ceac4b8d3fc960058 /.gitmodules | |
| parent | 89fb810c508786734e72c30f9e23688531dbd184 (diff) | |
| parent | af406cd3d0ad3b8b333a67b3bd74f8e67219f33b (diff) | |
Merge remote-tracking branch 'origin/master' into retina
Conflicts:
main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Core.addin.xml
main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
profiles/mac
version-checks
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 40776800ba..92938050c0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -35,6 +35,10 @@ [submodule "main/external/guiunit"] path = main/external/guiunit url = git://github.com/mono/guiunit.git +[submodule "main/external/fsharpbinding"] + path = main/external/fsharpbinding + url = git://github.com/fsharp/fsharpbinding.git + branch = vnext [submodule "main/external/raygun4net"] path = main/external/raygun4net url = git://github.com/mono/raygun4net.git |