From 34b606b9fc5f6e277297c4f8e14a0743104c2237 Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Mon, 1 Apr 2013 14:54:51 -0700 Subject: [PATCH] Prep for 2.6.0 final --- VERSION | 2 +- bin/templates/project/assets/www/index.html | 4 ++-- framework/assets/js/cordova.android.js | 6 +++--- framework/assets/www/index.html | 2 +- framework/src/org/apache/cordova/Device.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/VERSION b/VERSION index f47de854..e70b4523 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6.0rc1 +2.6.0 diff --git a/bin/templates/project/assets/www/index.html b/bin/templates/project/assets/www/index.html index 5596f621..4d39cf38 100644 --- a/bin/templates/project/assets/www/index.html +++ b/bin/templates/project/assets/www/index.html @@ -19,7 +19,7 @@ --> - + @@ -33,7 +33,7 @@

Device is Ready

- + + diff --git a/framework/src/org/apache/cordova/Device.java b/framework/src/org/apache/cordova/Device.java index ad399f02..0f828a1b 100644 --- a/framework/src/org/apache/cordova/Device.java +++ b/framework/src/org/apache/cordova/Device.java @@ -38,7 +38,7 @@ import android.telephony.TelephonyManager; public class Device extends CordovaPlugin { public static final String TAG = "Device"; - public static String cordovaVersion = "2.6.0rc1"; // Cordova version + public static String cordovaVersion = "2.6.0"; // Cordova version public static String platform = "Android"; // Device OS public static String uuid; // Device UUID