[Esbox-commits] r1996 - in branches/work_Ed: org.maemo.esbox.help/html/tasks org.maemo.esbox.maemosdk.core/conf org.maemo.esbox.vm.vmware

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-08-24 16:37:46 +0300 (Mon, 24 Aug 2009)
New Revision: 1996

Modified:
   branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html
   branches/work_Ed/org.maemo.esbox.maemosdk.core/conf/maemo_prefs.xml
   branches/work_Ed/org.maemo.esbox.vm.vmware/build.properties
Log:
Merge revs 1979:1994 from trunk

Modified: branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html	2009-08-24 13:33:39 UTC (rev 1995)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html	2009-08-24 13:37:46 UTC (rev 1996)
@@ -170,8 +170,6 @@
     
     <li>
       <p> 
-        If you have not already done so, ensure the device is connected via USB,
-        "attached" to the virtual machine if you use one, and ready to go.
         The <strong>Retry</strong> button will let you start over if you need
         to restart the device or adjust settings.
       <p/>
@@ -285,11 +283,6 @@
         </li>
         
         <li>
-          If <strong>Use from host machine</strong> is set, the flasher binary
-          may be used on Windows or Mac OS X with an appropriate port of the flasher.
-        </li>
-        
-        <li>
           <strong>Additional command line arguments</strong> will be passed on the 
           flasher command line, in addition to those derived from settings on other
           tabs.  

Modified: branches/work_Ed/org.maemo.esbox.maemosdk.core/conf/maemo_prefs.xml
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.core/conf/maemo_prefs.xml	2009-08-24 13:33:39 UTC (rev 1995)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.core/conf/maemo_prefs.xml	2009-08-24 13:37:46 UTC (rev 1996)
@@ -7,7 +7,7 @@
 	
 	<!-- others commands -->	
 	<entry key="DISPLAY_X_COMMAND_UNIX">Xephyr ${DISPLAY} -host-cursor -dpi 96 -ac -screen ${RESOLUTION} ${PLATFORM_PARAMETERS}</entry>
-	<entry key="DISPLAY_X_COMMAND_OSX">Xephyr ${DISPLAY} -host-cursor -dpi 96 -ac -screen ${RESOLUTION} ${PLATFORM_PARAMETERS}</entry>
+	<entry key="DISPLAY_X_COMMAND_OSX">Xephyr ${DISPLAY} -host-cursor -dpi 96 -ac -extension MIT-SHM -screen ${RESOLUTION} ${PLATFORM_PARAMETERS}</entry>
 	<entry key="DISPLAY_X_COMMAND_WIN32">c:/cygwin/bin/Xwin ${DISPLAY} -lesspointer -swcursor -dpi 96 -ac -screen 0 ${RESOLUTION} ${PLATFORM_PARAMETERS}</entry>
 	<!-- this is initialized dynamically <entry key="DISPLAY_X_COMMAND"></entry> -->
 	

Modified: branches/work_Ed/org.maemo.esbox.vm.vmware/build.properties
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm.vmware/build.properties	2009-08-24 13:33:39 UTC (rev 1995)
+++ branches/work_Ed/org.maemo.esbox.vm.vmware/build.properties	2009-08-24 13:37:46 UTC (rev 1996)
@@ -5,4 +5,6 @@
                plugin.xml,\
                conf/,\
                about_files/,\
-               about.html
+               about.html,\
+               data/,\
+               icons/