[mono/monodevelop] 022e5b12: [Icons] More filename references fixed, hopefully, and a md-addins bump

   Branch: refs/heads/retina
     Home: https://github.com/mono/monodevelop
  Compare: https://github.com/mono/monodevelop/compare/6677604a4e20...022e5b12ea27

   Commit: 022e5b12ea27e73d2fb9527764201ed3a10c7f6d
   Author: Vaclav Vancura <[email protected]> (vancura)
     Date: 2013-10-14 15:10:51 GMT
      URL: https://github.com/mono/monodevelop/commit/022e5b12ea27e73d2fb9527764201ed3a10c7f6d

[Icons] More filename references fixed, hopefully, and a md-addins bump

Changed paths:
  M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
  M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
  M version-checks

Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
===================================================================
@@ -229,7 +229,7 @@
     <EmbeddedResource Include="icons\exception-icon.png">
       <LogicalName>exception-icon.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\exception-icon%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
   </ItemGroup>

Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
===================================================================
@@ -1173,199 +1173,199 @@
     <EmbeddedResource Include="icons\issuestatus-warning-16.png">
       <LogicalName>issuestatus-warning-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\component-folder-closed-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\component-folder-open-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\folder-closed-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\reference-folder-closed-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\resource-folder-closed-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\solution-folder-closed-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\folder-open-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\reference-folder-open-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\resource-folder-open-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\solution-folder-open-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\assembly-reference-overlay-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\invalid-reference-overlay-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\project-reference-overlay-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\solution-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\element-class-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\element-delegate-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\element-enumeration-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\element-event-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\element-extensionmethod-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\element-field-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\element-interface-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\element-constant-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\element-method-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\element-namespace-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\element-property-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\element-structure-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-class-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-enumeration-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-interface-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-struct-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-xml-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-xml-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\project-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\project-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\project-console-overlay-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\project-gui-overlay-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\project-library-overlay-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\project-reference-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\solution-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-template-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-template-surround-with-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\project-web-overlay-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\workspace-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\workspace-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-resource-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-resource-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-text-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-text-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-generic-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\file-source-16.png">
       <LogicalName>file-source-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-source-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\file-source-32.png">
       <LogicalName>file-source-32.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-source-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\file-header-16.png">
       <LogicalName>file-header-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-header-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\file-header-32.png">
       <LogicalName>file-header-32.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-header-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\file-unit-test-32.png">
       <LogicalName>file-unit-test-32.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-unit-test-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\file-web-16.png">
       <LogicalName>file-web-16.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-web-16%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\file-web-32.png">
       <LogicalName>file-web-32.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-web-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
     <EmbeddedResource Include="icons\file-gtk-32.png">
       <LogicalName>file-gtk-32.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\file-gtk-32%402x.png">
+    <EmbeddedResource Include="icons\[email protected]">
       <LogicalName>[email protected]</LogicalName>
     </EmbeddedResource>
   </ItemGroup>

Modified: version-checks
===================================================================
@@ -17,7 +17,7 @@ DEP[0]=md-addins
 DEP_NAME[0]=MDADDINS
 DEP_PATH[0]=${top_srcdir}/../md-addins
 DEP_MODULE[0][email protected]:xamarin/md-addins.git
-DEP_NEEDED_VERSION[0]=0824bd8adec05c323c5716717a5a35d4d0219b6d
+DEP_NEEDED_VERSION[0]=51c2affc8124bc95541d8ec147d823e0922c18cf
 DEP_BRANCH_AND_REMOTE[0]="retina origin/retina"
 
 # heap-shot


_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches