diff options
| author | Matt Ward <matt.ward@xamarin.com> | 2017-02-14 13:09:05 +0300 |
|---|---|---|
| committer | Matt Ward <matt.ward@xamarin.com> | 2017-02-14 13:23:36 +0300 |
| commit | 9758cf4d44acf0a396c2bafb16f818177c5a87db (patch) | |
| tree | 22bf0c832e25ce365507f4466d1553e846ca81c4 /main/src/addins/MacPlatform/MacPlatform.csproj | |
| parent | f8aa3e747850a8a8bc7749482caba6e0e4da8200 (diff) | |
| parent | 7a818c9a01f5340f1cc1b7c559a2149a9ff12b30 (diff) | |
Merge branch 'master' into vNext
Conflicts:
main/external/mono-addins
main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextViewMargin.cs
main/src/core/Mono.TextEditor.Shared/Mono.TextEditor.Utils/ImmutableText.cs
main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/Document/TextDocument.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProjectService.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
version-checks
Diffstat (limited to 'main/src/addins/MacPlatform/MacPlatform.csproj')
| -rw-r--r-- | main/src/addins/MacPlatform/MacPlatform.csproj | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/main/src/addins/MacPlatform/MacPlatform.csproj b/main/src/addins/MacPlatform/MacPlatform.csproj index 994b294aa6..79d0d63ed8 100644 --- a/main/src/addins/MacPlatform/MacPlatform.csproj +++ b/main/src/addins/MacPlatform/MacPlatform.csproj @@ -229,18 +229,6 @@ <EmbeddedResource Include="icons\status-stop-16~dark%402x.png"> <LogicalName>status-stop-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\status-stop-16~dark~hover.png"> - <LogicalName>status-stop-16~dark~hover.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="icons\status-stop-16~dark~hover%402x.png"> - <LogicalName>status-stop-16~dark~hover@2x.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="icons\status-stop-16~hover.png"> - <LogicalName>status-stop-16~hover.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="icons\status-stop-16~hover%402x.png"> - <LogicalName>status-stop-16~hover@2x.png</LogicalName> - </EmbeddedResource> </ItemGroup> <ItemGroup> <Folder Include="Dialogs\" /> |