Incrementing version to 2.3.0 final

blizzardniu · Jan 3, 2013 · 7c069f1 · 7c069f1
1 parent 6efeb14
commit 7c069f1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.3.0rc2
+2.3.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.3.0rc2.js"></script>
+        <script type="text/javascript" src="cordova-2.3.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,6 +1,6 @@
-// commit 4301bc92e237b59d5515bd7758ab289e454168cb
+// commit 4082ee0ba3a8902cba7bd087d0584bb7534e694b
 
-// File generated at :: Mon Dec 10 2012 14:13:09 GMT-0800 (PST)
+// File generated at :: Wed Jan 02 2013 16:43:38 GMT-0800 (PST)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -6420,12 +6420,12 @@ window.cordova = require('cordova');
 
                     // Drop the common globals into the window object, but be nice and don't overwrite anything.
                     builder.buildIntoButDoNotClobber(base.defaults, context);
-                    builder.buildIntoAndMerge(base.merges, context);
                     builder.buildIntoAndClobber(base.clobbers, context);
+                    builder.buildIntoAndMerge(base.merges, context);
 
                     builder.buildIntoButDoNotClobber(platform.defaults, context);
-                    builder.buildIntoAndMerge(platform.merges, context);
                     builder.buildIntoAndClobber(platform.clobbers, context);
+                    builder.buildIntoAndMerge(platform.merges, context);
 
                     // Call the platform-specific initialization
                     platform.initialize();

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.3.0rc2";              // Cordova version
+    public static String cordovaVersion = "2.3.0";              // Cordova version
     public static String platform = "Android";                  // Device OS
     public static String uuid;                                  // Device UUID