cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject android commit: Prep for 2.6.0 final
Date Mon, 01 Apr 2013 21:56:07 GMT
Updated Branches:
  refs/heads/master f12262ea9 -> b42c91897


Prep for 2.6.0 final


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/b42c9189
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/b42c9189
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/b42c9189

Branch: refs/heads/master
Commit: b42c918973efcdcd9f45b9f88d7ec511193a8a38
Parents: f12262e
Author: Joe Bowser <bowserj@apache.org>
Authored: Mon Apr 1 14:54:51 2013 -0700
Committer: Joe Bowser <bowserj@apache.org>
Committed: Mon Apr 1 14:54:51 2013 -0700

----------------------------------------------------------------------
 VERSION                                      |    2 +-
 bin/templates/project/assets/www/index.html  |    4 ++--
 framework/assets/js/cordova.android.js       |    4 ++--
 framework/assets/www/index.html              |    2 +-
 framework/src/org/apache/cordova/Device.java |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/b42c9189/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index f47de85..e70b452 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6.0rc1
+2.6.0

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/b42c9189/bin/templates/project/assets/www/index.html
----------------------------------------------------------------------
diff --git a/bin/templates/project/assets/www/index.html b/bin/templates/project/assets/www/index.html
index 5596f62..4d39cf3 100644
--- a/bin/templates/project/assets/www/index.html
+++ b/bin/templates/project/assets/www/index.html
@@ -19,7 +19,7 @@
 -->
 <html>
     <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <meta charset="utf-8" />
         <meta name="format-detection" content="telephone=no" />
         <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1,
minimum-scale=1, width=device-width, height=device-height, target-densitydpi=device-dpi" />
         <link rel="stylesheet" type="text/css" href="css/index.css" />
@@ -33,7 +33,7 @@
                 <p class="event received">Device is Ready</p>
             </div>
         </div>
-        <script type="text/javascript" src="cordova-2.6.0rc1.js"></script>
+        <script type="text/javascript" src="cordova-2.6.0.js"></script>
         <script type="text/javascript" src="js/index.js"></script>
         <script type="text/javascript">
             app.initialize();

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/b42c9189/framework/assets/js/cordova.android.js
----------------------------------------------------------------------
diff --git a/framework/assets/js/cordova.android.js b/framework/assets/js/cordova.android.js
index 3854f7f..93e85d1 100644
--- a/framework/assets/js/cordova.android.js
+++ b/framework/assets/js/cordova.android.js
@@ -1,8 +1,8 @@
 // Platform: android
 
-// commit 104709b2130a29e7ad8596d1a6cee1ed48138803
+// commit 125dca530923a44a8f44f68f5e1970cbdd4e7faf
 
-// File generated at :: Wed Mar 27 2013 13:25:10 GMT-0700 (PDT)
+// File generated at :: Mon Apr 01 2013 13:28:03 GMT-0700 (PDT)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/b42c9189/framework/assets/www/index.html
----------------------------------------------------------------------
diff --git a/framework/assets/www/index.html b/framework/assets/www/index.html
index 3b15a4e..1caeb8a 100644
--- a/framework/assets/www/index.html
+++ b/framework/assets/www/index.html
@@ -19,7 +19,7 @@
 <html>
   <head>
     <title></title>
-    <script src="cordova-2.6.0rc1.js"></script>
+    <script src="cordova-2.6.0.js"></script>
   </head>
   <body>
 

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/b42c9189/framework/src/org/apache/cordova/Device.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/Device.java b/framework/src/org/apache/cordova/Device.java
index ad399f0..0f828a1 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
 


Mime
View raw message