Merge branch '2.9.x' of https://git-wip-us.apache.org/repos/asf/cordova-android into 2.9.x

Incrementing versions and updating code
Accidentally commented "build" out when running ./run --emulator. Whoops D:
2026-05-11 00:00:05 +08:00 · 2013-06-25 14:12:41 -07:00 · 2013-06-25 14:11:30 -07:00 · 2013-06-21 14:24:07 -07:00
4 changed files with 5 additions and 5 deletions
@@ -1 +1 @@
-2.9.0rc1
+2.9.0
@@ -66,7 +66,7 @@ elif [[ "$#" -eq 1 ]] ; then
        $DIR/build
        $DIR/lib/install-device
    elif [[ $1 == "--emulator" ]] ; then
-        #$DIR/build
+        $DIR/build
        run_on_emulator
    elif [[ $1 =~ "--target=" ]]; then
        $DIR/build
@@ -1,5 +1,5 @@
 // Platform: android
-// 2.9.0rc1-0-g002f33d
+// 2.9.0-0-g83dc4bd
 /*
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -19,7 +19,7 @@
 under the License.
 */
 ;(function() {
-var CORDOVA_JS_BUILD_LABEL = '2.9.0rc1-0-g002f33d';
+var CORDOVA_JS_BUILD_LABEL = '2.9.0-0-g83dc4bd';
 // file: lib/scripts/require.js

 var require,
@@ -38,7 +38,7 @@ import android.telephony.TelephonyManager;
 public class Device extends CordovaPlugin {
    public static final String TAG = "Device";

-    public static String cordovaVersion = "2.9.0rc1";              // Cordova version
+    public static String cordovaVersion = "2.9.0";              // Cordova version
    public static String platform = "Android";                  // Device OS
    public static String uuid;                                  // Device UUID
Author	SHA1	Message	Date
Joe Bowser	df1536ea77	Merge branch '2.9.x' of https://git-wip-us.apache.org/repos/asf/cordova-android into 2.9.x	2013-06-25 14:12:41 -07:00
Joe Bowser	6aff54be76	Incrementing versions and updating code	2013-06-25 14:11:30 -07:00
Fil Maj	24a0e8956c	Accidentally commented "build" out when running ./run --emulator. Whoops D:	2013-06-21 14:24:07 -07:00
@@ -1 +1 @@
 .9.0rc1
 .9.0