Merged heads
authorEugene Ostroukhov <eugeneo@symbian.org>
Fri, 26 Mar 2010 10:25:30 -0700
changeset 284 5a06888861c3
parent 283 c035b31473c1 (current diff)
parent 280 7f932d481521 (diff)
child 285 bf9d8e184dd0
Merged heads
--- a/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Mac OS X).launch	Thu Mar 25 14:10:40 2010 -0700
+++ b/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Mac OS X).launch	Fri Mar 26 10:25:30 2010 -0700
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
 <booleanAttribute key="append.args" value="true"/>
 <booleanAttribute key="askclear" value="true"/>
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/deploy/PhoneTarget.java	Thu Mar 25 14:10:40 2010 -0700
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/deploy/PhoneTarget.java	Fri Mar 26 10:25:30 2010 -0700
@@ -47,7 +47,7 @@
         if (isResolved()) {
             return MessageFormat.format("Bluetooth address: {0}", getAddr());
         } else {
-            return "This deviced was used in the previous session and might not be available";
+            return "This device was used in the previous session and might not be available";
         }
     }