diff options
| author | Matt Ward <matt.ward@xamarin.com> | 2017-03-14 16:10:33 +0300 |
|---|---|---|
| committer | Matt Ward <matt.ward@xamarin.com> | 2017-03-14 16:10:33 +0300 |
| commit | 32904609a10ebf88705750219a18c07be708cc2f (patch) | |
| tree | 55c9e06e4a462461be303a8297f3695f7478c9bd /main/src/core/MonoDevelop.Ide/ExtensionModel | |
| parent | c0bcf1beb3ee534f55f2574728788364b57eb2f9 (diff) | |
| parent | 49e03ab5dd11b63b750a439b3841cf146ba2752e (diff) | |
Merge branch 'master' into vNext
Conflicts:
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextPasteHandler.cs
main/src/addins/MonoDevelop.Debugger.Win32/Mono.Debugging.Win32/Mono.Debugging.Win32.csproj
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/ExtensionModel')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml index fd18d24419..02dac6cc86 100644 --- a/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml +++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml @@ -281,6 +281,11 @@ <StockIcon stockid="md-folder-services" resource="folder-services-16.png" /> <StockIcon stockid="md-getting-started" resource="getting-started-16.png" size="Menu" /> <StockIcon stockid="md-recent" resource="recent-16.png" size="Menu" /> + <StockIcon stockid="md-palette" resource="palette-16.png" size="Menu" /> + <StockIcon stockid="md-style" resource="style-16.png" size="Menu" /> + <StockIcon stockid="md-typography" resource="typography-16.png" size="Menu" /> + <StockIcon stockid="md-scroll" resource="scroll-16.png" size="Menu" /> + <StockIcon stockid="md-widget" resource="widget-16.png" size="Menu" /> <!-- Project icons --> <StockIcon stockid="md-workspace" resource="workspace-32.png" size="Dnd" /> |