Preparing for 2.4.0

blizzardniu · Feb 4, 2013 · db099e7 · db099e7
1 parent fcc01bc
commit db099e7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.4.0rc2
+2.4.0
diff --git a/bin/templates/project/assets/www/index.html b/bin/templates/project/assets/www/index.html
@@ -33,7 +33,7 @@ <h1>Apache Cordova</h1>
                 <p class="event received">Device is Ready</p>
             </div>
         </div>
-        <script type="text/javascript" src="cordova-2.4.0rc2.js"></script>
+        <script type="text/javascript" src="cordova-2.4.0.js"></script>
         <script type="text/javascript" src="js/index.js"></script>
         <script type="text/javascript">
             app.initialize();

diff --git a/framework/assets/js/cordova.android.js b/framework/assets/js/cordova.android.js
@@ -1,8 +1,8 @@
 // Platform: android
 
-// commit e784eee3ce02dbd475e3c3f70031668f1706f2ec
+// commit ac725f6ae0bd655789771e2a40b8d60cb4c8c221
 
-// File generated at :: Wed Jan 30 2013 09:20:09 GMT-0500 (EST)
+// File generated at :: Mon Feb 04 2013 10:59:03 GMT-0800 (PST)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -1665,6 +1665,7 @@ module.exports = {
         CELL_2G: "2g",
         CELL_3G: "3g",
         CELL_4G: "4g",
+        CELL:"cellular",
         NONE: "none"
 };
 

diff --git a/framework/assets/www/index.html b/framework/assets/www/index.html
@@ -19,7 +19,7 @@
 <html>
   <head>
     <title></title>
-    <script src="cordova-2.4.0rc2.js"></script>
+    <script src="cordova-2.4.0.js"></script>
   </head>
   <body>
 

diff --git a/framework/src/org/apache/cordova/Device.java b/framework/src/org/apache/cordova/Device.java
@@ -39,7 +39,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 public class Device extends CordovaPlugin {
     public static final String TAG = "Device";
 
-    public static String cordovaVersion = "2.4.0rc2";              // Cordova version
+    public static String cordovaVersion = "2.4.0";              // Cordova version
     public static String platform = "Android";                  // Device OS
     public static String uuid;                                  // Device UUID
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ @@
     <html>
       <head>
         <title></title>
-        <script src="cordova-2.4.0rc2.js"></script>
+        <script src="cordova-2.4.0.js"></script>
       </head>
       <body>
@@ Expand Down @@