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 /profiles | |
| 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 'profiles')
| -rw-r--r-- | profiles/mac | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/profiles/mac b/profiles/mac index ff852fb8f4..9e695ba066 100644 --- a/profiles/mac +++ b/profiles/mac @@ -1 +1,2 @@ main --disable-update-mimedb --disable-update-desktopdb --disable-gnomeplatform --enable-macplatform --enable-tests +main/external/fsharpbinding/monodevelop --addins-dir=bin/mac-linux/Debug |