diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2014-02-24 15:13:48 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2014-02-24 15:24:48 +0400 |
| commit | f8580cbe92f662708b005691990c608bd77d4e10 (patch) | |
| tree | 55657ca133b217cd074dfe57595d7c2fe0224204 /main/Main.sln | |
| parent | a74ea2dece1d9155929f637bcfc39facb53ccc32 (diff) | |
| parent | e745723f147fb605bf72efccef672d7b46aff612 (diff) | |
Merge remote-tracking branch 'origin/master' into retina
Conflicts:
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionWidget.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
Diffstat (limited to 'main/Main.sln')
| -rw-r--r-- | main/Main.sln | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/main/Main.sln b/main/Main.sln index 6f9b127577..9a5c1b1bd3 100644 --- a/main/Main.sln +++ b/main/Main.sln @@ -272,6 +272,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.TextEditor.Test EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ide.Tests", "tests\Ide.Tests\Ide.Tests.csproj", "{73D4CC8B-BAB9-4A29-841B-F25C6311F067}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8D032520-DF32-49A7-9E8A-80819C011970}"
+ ProjectSection(SolutionItems) = preProject
+ Main.sln = Main.sln
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -316,13 +321,13 @@ Global {07CC7654-27D6-421D-A64C-0FFA40456FA2}.Release|x86.ActiveCfg = Release|Any CPU
{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Release|x86.Build.0 = Release|Any CPU
{07F55155-51A8-4072-9F80-FA473666F086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {07F55155-51A8-4072-9F80-FA473666F086}.Debug|Any CPU.Build.0 = Debug|Any CPU + {07F55155-51A8-4072-9F80-FA473666F086}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07F55155-51A8-4072-9F80-FA473666F086}.Debug|x86.ActiveCfg = Debug|Any CPU
{07F55155-51A8-4072-9F80-FA473666F086}.Debug|x86.Build.0 = Debug|Any CPU
{07F55155-51A8-4072-9F80-FA473666F086}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {07F55155-51A8-4072-9F80-FA473666F086}.DebugMac|Any CPU.Build.0 = Debug|Any CPU + {07F55155-51A8-4072-9F80-FA473666F086}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{07F55155-51A8-4072-9F80-FA473666F086}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {07F55155-51A8-4072-9F80-FA473666F086}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU + {07F55155-51A8-4072-9F80-FA473666F086}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{07F55155-51A8-4072-9F80-FA473666F086}.Release|Any CPU.ActiveCfg = Release|Any CPU
{07F55155-51A8-4072-9F80-FA473666F086}.Release|x86.ActiveCfg = Release|Any CPU
{07F55155-51A8-4072-9F80-FA473666F086}.Release|x86.Build.0 = Release|Any CPU
|