diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2014-05-15 13:49:30 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2014-05-15 13:49:30 +0400 |
| commit | b9e21d15c0fc94fa24cc4019e358f8b274e9e1cb (patch) | |
| tree | e8aed2cff6fcc37834ce57c6034b8a40d6bba28a /.gitmodules | |
| parent | 65bea01b2489e876ea9025523c3985bbb61e0683 (diff) | |
| parent | a85fca7304820f2dceff6bcd4dcd5a7a22819105 (diff) | |
Merge branch 'master' into retina-roslyn
Conflicts:
main/external/nrefactory
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/LanguageItemTooltipProvider.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp/AstStockIcons.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs
main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index c10d5bbcc0..de656c7cb9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -38,7 +38,7 @@ [submodule "main/external/fsharpbinding"] path = main/external/fsharpbinding url = git://github.com/fsharp/fsharpbinding.git - branch = vnext + branch = master [submodule "main/external/raygun4net"] path = main/external/raygun4net url = git://github.com/mono/raygun4net.git |