[Esbox-commits] r1012 - in trunk: org.maemo.esbox.maemosdk.ui/icons/full/etool16 org.maemo.esbox.vm org.maemo.esbox.vm/icons org.maemo.esbox.vm/icons/full org.maemo.esbox.vm/icons/full/etool16 org.maemo.esbox.vm/icons/full/wizban

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2008-12-01 21:53:51 +0200 (Mon, 01 Dec 2008)
New Revision: 1012

Added:
   trunk/org.maemo.esbox.vm/icons/
   trunk/org.maemo.esbox.vm/icons/full/
   trunk/org.maemo.esbox.vm/icons/full/etool16/
   trunk/org.maemo.esbox.vm/icons/full/etool16/virtual_machine.png
   trunk/org.maemo.esbox.vm/icons/full/wizban/
   trunk/org.maemo.esbox.vm/icons/full/wizban/virtual_machine_wiz.png
Removed:
   trunk/org.maemo.esbox.vm/icons/full/
   trunk/org.maemo.esbox.vm/icons/full/etool16/
   trunk/org.maemo.esbox.vm/icons/full/etool16/virtual_machine.png
   trunk/org.maemo.esbox.vm/icons/full/wizban/
   trunk/org.maemo.esbox.vm/icons/full/wizban/virtual_machine_wiz.png
Modified:
   trunk/org.maemo.esbox.maemosdk.ui/icons/full/etool16/maemomenu_misc.png
   trunk/org.maemo.esbox.vm/build.properties
   trunk/org.maemo.esbox.vm/plugin.xml
Log:
Merge revs 1008:1009 from branch work_Ed (icons)

Modified: trunk/org.maemo.esbox.maemosdk.ui/icons/full/etool16/maemomenu_misc.png
===================================================================
(Binary files differ)

Modified: trunk/org.maemo.esbox.vm/build.properties
===================================================================
--- trunk/org.maemo.esbox.vm/build.properties	2008-12-01 19:52:18 UTC (rev 1011)
+++ trunk/org.maemo.esbox.vm/build.properties	2008-12-01 19:53:51 UTC (rev 1012)
@@ -5,4 +5,5 @@
                plugin.xml,\
                about_files/,\
                about.html,\
-               conf/
+               conf/,\
+               icons/

Copied: trunk/org.maemo.esbox.vm/icons (from rev 1008, branches/work_Ed/org.maemo.esbox.vm/icons)

Copied: trunk/org.maemo.esbox.vm/icons/full (from rev 1008, branches/work_Ed/org.maemo.esbox.vm/icons/full)

Copied: trunk/org.maemo.esbox.vm/icons/full/etool16 (from rev 1008, branches/work_Ed/org.maemo.esbox.vm/icons/full/etool16)

Deleted: trunk/org.maemo.esbox.vm/icons/full/etool16/virtual_machine.png
===================================================================
(Binary files differ)

Copied: trunk/org.maemo.esbox.vm/icons/full/etool16/virtual_machine.png (from rev 1008, branches/work_Ed/org.maemo.esbox.vm/icons/full/etool16/virtual_machine.png)
===================================================================
(Binary files differ)

Copied: trunk/org.maemo.esbox.vm/icons/full/wizban (from rev 1008, branches/work_Ed/org.maemo.esbox.vm/icons/full/wizban)

Deleted: trunk/org.maemo.esbox.vm/icons/full/wizban/virtual_machine_wiz.png
===================================================================
(Binary files differ)

Copied: trunk/org.maemo.esbox.vm/icons/full/wizban/virtual_machine_wiz.png (from rev 1008, branches/work_Ed/org.maemo.esbox.vm/icons/full/wizban/virtual_machine_wiz.png)
===================================================================
(Binary files differ)

Modified: trunk/org.maemo.esbox.vm/plugin.xml
===================================================================
--- trunk/org.maemo.esbox.vm/plugin.xml	2008-12-01 19:52:18 UTC (rev 1011)
+++ trunk/org.maemo.esbox.vm/plugin.xml	2008-12-01 19:53:51 UTC (rev 1012)
@@ -19,6 +19,7 @@
                commandId="org.maemo.esbox.vm.validateVirtualMachineCommand"
                mnemonic="V"
                style="push"
+               icon="icons/full/etool16/virtual_machine.png"
                tooltip="Run to ensure that the build machine is properly configured.">
          </command>
       </menuContribution>