incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject [1/4] android commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android into CordovaWebView
Date Tue, 05 Jun 2012 22:50:49 GMT
Updated Branches:
  refs/heads/CordovaWebView 0ad9ff0d8 -> 03aaab6f8


Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android
into CordovaWebView


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

Branch: refs/heads/CordovaWebView
Commit: 03aaab6f8bbb79eadaa60846aa21c079f34f86b7
Parents: c8af154 a489ae0
Author: Joe Bowser <bowserj@apache.org>
Authored: Tue Jun 5 15:45:33 2012 -0700
Committer: Joe Bowser <bowserj@apache.org>
Committed: Tue Jun 5 15:45:33 2012 -0700

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


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/03aaab6f/framework/assets/js/cordova.android.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/03aaab6f/framework/src/org/apache/cordova/Device.java
----------------------------------------------------------------------
diff --cc framework/src/org/apache/cordova/Device.java
index 33d3595,a471fee..d790d0a
--- a/framework/src/org/apache/cordova/Device.java
+++ b/framework/src/org/apache/cordova/Device.java
@@@ -38,10 -38,10 +38,10 @@@ import android.telephony.TelephonyManag
  public class Device extends Plugin {
      public static final String TAG = "Device";
  
-     public static String cordovaVersion = "1.8.0rc1";              // Cordova version
+     public static String cordovaVersion = "1.8.0";              // Cordova version
      public static String platform = "Android";                  // Device OS
      public static String uuid;                                  // Device UUID
 -    
 +
      BroadcastReceiver telephonyReceiver = null;
  
      /**


Mime
View raw message