diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2014-03-03 13:02:33 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2014-03-03 13:02:33 +0400 |
| commit | a41e429b4cd5dc717a037b2086db03df06aa2740 (patch) | |
| tree | 765c29072a3661c056cfbcc14e15493cae92be73 /main/src/tools | |
| parent | f2c2840ac9f3f29a01e4a7457e261a07f4ac1162 (diff) | |
| parent | 017cecfc1febb5580b94b21362f35bc0d963cc88 (diff) | |
Merge remote-tracking branch 'origin/master' into retina
Conflicts:
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs
version-checks
Diffstat (limited to 'main/src/tools')
| -rw-r--r-- | main/src/tools/mdhost/mdhost.csproj | 2 | ||||
| -rw-r--r-- | main/src/tools/mdtool/mdtool.csproj | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/src/tools/mdhost/mdhost.csproj b/main/src/tools/mdhost/mdhost.csproj index 12028a06f1..97d977bed7 100644 --- a/main/src/tools/mdhost/mdhost.csproj +++ b/main/src/tools/mdhost/mdhost.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">x86</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{BFE8691A-D323-4622-9021-7B8B27F81599}</ProjectGuid> <OutputType>Exe</OutputType> diff --git a/main/src/tools/mdtool/mdtool.csproj b/main/src/tools/mdtool/mdtool.csproj index 49035c7e7c..0b732f2a6b 100644 --- a/main/src/tools/mdtool/mdtool.csproj +++ b/main/src/tools/mdtool/mdtool.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">x86</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}</ProjectGuid> <OutputType>Exe</OutputType> |