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/Main.sln | |
| 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/Main.sln')
| -rw-r--r-- | main/Main.sln | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/main/Main.sln b/main/Main.sln index 9a5c1b1bd3..718db8425a 100644 --- a/main/Main.sln +++ b/main/Main.sln @@ -272,11 +272,6 @@ 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
|