diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2013-12-04 23:25:46 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2013-12-04 23:25:46 +0400 |
| commit | 9466a7a325655039c6e8edfb0a63dc5aca37ad25 (patch) | |
| tree | a1cc3701f9dd493b775b57bdf40d7c7e2d1933d9 /main/src/addins/GnomePlatform | |
| parent | 9e34b311a80186122a0d16d854fd309b2e7b9a6c (diff) | |
| parent | 41edf4fb7f050eb62ffdbf99bef8caec1852f98c (diff) | |
Merge branch 'master' into retina
Conflicts:
main/src/addins/CBinding/CBinding.csproj
main/src/addins/CSharpBinding/CSharpBinding.csproj
main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
version-checks
Diffstat (limited to 'main/src/addins/GnomePlatform')
| -rw-r--r-- | main/src/addins/GnomePlatform/GnomePlatform.csproj | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/src/addins/GnomePlatform/GnomePlatform.csproj b/main/src/addins/GnomePlatform/GnomePlatform.csproj index bbf831b40c..d36d9eebb7 100644 --- a/main/src/addins/GnomePlatform/GnomePlatform.csproj +++ b/main/src/addins/GnomePlatform/GnomePlatform.csproj @@ -18,9 +18,9 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <ConsolePause>False</ConsolePause> - <GenerateDocumentation>true</GenerateDocumentation> <DefineConstants>DEBUG</DefineConstants> <NoWarn>1591;1573</NoWarn> + <DocumentationFile>..\..\..\build\AddIns\GnomePlatform.xml</DocumentationFile> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -30,8 +30,8 @@ <WarningLevel>4</WarningLevel> <ConsolePause>False</ConsolePause> <DebugSymbols>true</DebugSymbols> - <GenerateDocumentation>true</GenerateDocumentation> <NoWarn>1591;1573</NoWarn> + <DocumentationFile>bin\Release\GnomePlatform.xml</DocumentationFile> </PropertyGroup> <ItemGroup> <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> |