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/VBNetBinding | |
| 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/VBNetBinding')
| -rw-r--r-- | main/src/addins/VBNetBinding/VBNetBinding.csproj | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/main/src/addins/VBNetBinding/VBNetBinding.csproj b/main/src/addins/VBNetBinding/VBNetBinding.csproj index e74f38af39..f50940b03e 100644 --- a/main/src/addins/VBNetBinding/VBNetBinding.csproj +++ b/main/src/addins/VBNetBinding/VBNetBinding.csproj @@ -73,8 +73,7 @@ <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"> <SpecificVersion>False</SpecificVersion> </Reference> - <Reference Include="System.Core"> - </Reference> + <Reference Include="System.Core" /> </ItemGroup> <ItemGroup> <Compile Include="AssemblyInfo.cs" /> |