diff options
| author | Bertrand Le Roy <beleroy@microsoft.com> | 2017-11-21 03:45:16 +0300 |
|---|---|---|
| committer | Bertrand Le Roy <beleroy@microsoft.com> | 2017-11-21 03:45:16 +0300 |
| commit | 7c565d5af6303017437a521d11c90ac1583016c2 (patch) | |
| tree | 5a8eec3495a7f09a6e65988b14014d8e90b02bcc /Xamarin.PropertyEditing.Mac.Standalone | |
| parent | d271fb3b70d8cdc8ee1deb658af68833071289bd (diff) | |
| parent | c5590c312d9aef1dd6a8b3987f5849de8da41edd (diff) | |
Merge remote-tracking branch 'origin/master' into bleroy-BrushEditor
# Conflicts:
# Xamarin.PropertyEditing.Tests/MockControls/MockControl.cs
# Xamarin.PropertyEditing.Windows/EditorPropertySelector.cs
# Xamarin.PropertyEditing.Windows/Themes/Resources.xaml
# Xamarin.PropertyEditing.Windows/Xamarin.PropertyEditing.Windows.csproj
# Xamarin.PropertyEditing/Properties/Resources.Designer.cs
# Xamarin.PropertyEditing/Properties/Resources.resx
# Xamarin.PropertyEditing/ViewModels/PropertyViewModel.cs
Diffstat (limited to 'Xamarin.PropertyEditing.Mac.Standalone')
| -rw-r--r-- | Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj b/Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj index 620721d..f835a47 100644 --- a/Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj +++ b/Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj @@ -26,7 +26,7 @@ <IncludeMonoRuntime>false</IncludeMonoRuntime>
<UseSGen>true</UseSGen>
<UseRefCounting>true</UseRefCounting>
- <Profiling>true</Profiling>
+ <Profiling>false</Profiling>
<HttpClientHandler></HttpClientHandler>
<LinkMode></LinkMode>
<XamMacArch></XamMacArch>
|