diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2011-07-22 14:11:28 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2011-07-22 14:11:28 +0400 |
| commit | 802729acccb611c280e6dd24c7e003f1e68f0cfe (patch) | |
| tree | 27d8d9ad977f8023eab095f51b29a6d0fed4f11a /main/src/addins/AspNet | |
| parent | dbd6e685ef6f8ff1e8acf54a173cff6fdae67c59 (diff) | |
| parent | 5bcd595f360d52d2d2d93782e913f4957b2e91df (diff) | |
Merge branch 'master' into newresolver
Conflicts:
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineNodeComparer.cs
main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs
main/src/addins/MonoDevelop.MacDev/Makefile.am
main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.csproj
main/src/addins/MonoDevelop.MacDev/ObjCIntegration/CSharpCodeCodebehind.cs
main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor/XmlDocumentParser.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Parser/ProjectDomService.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom/DomCecilCompilationUnit.cs
Diffstat (limited to 'main/src/addins/AspNet')
| -rw-r--r-- | main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.csproj | 3 | ||||
| -rw-r--r-- | main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.csproj index f0d021c83e..32a88b5b55 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.csproj +++ b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/MonoDevelop.AspNet.Mvc.csproj @@ -44,8 +44,7 @@ <ItemGroup> <Reference Include="System" /> <Reference Include="System.Xml" /> - <Reference Include="System.Core"> - </Reference> + <Reference Include="System.Core" /> <Reference Include="Mono.Posix" /> <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> <SpecificVersion>False</SpecificVersion> diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj index c94936b6c1..ffafa68b10 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj @@ -91,8 +91,7 @@ <Reference Include="System.Design" /> <Reference Include="System.Drawing" /> <Reference Include="System.Configuration" /> - <Reference Include="System.Core"> - </Reference> + <Reference Include="System.Core" /> <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> <SpecificVersion>False</SpecificVersion> </Reference> @@ -108,8 +107,7 @@ <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> <SpecificVersion>False</SpecificVersion> </Reference> - <Reference Include="System.Xml.Linq"> - </Reference> + <Reference Include="System.Xml.Linq" /> <Reference Include="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"> <SpecificVersion>False</SpecificVersion> <Private>False</Private> |