github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-05-11 00:00:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joe Bowser
2012-04-23 14:30:22 -07:00
parent ca66c4bf59 f4da7e164d
commit be39bf8d91
5 changed files with 188 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/assets/js/cordova.android.js
+184 -232
View File
File diff suppressed because it is too large Load Diff
framework/assets/www/index.html
+1 -1
View File
@@ -19,7 +19,7 @@
<html>
<head>
<title></title>
<script src="cordova-1.6.1.js"></script>
<script src="cordova-1.7.0rc1.js"></script>
</head>
<body>
framework/src/org/apache/cordova/Device.java
+1 -1
View File
@@ -38,7 +38,7 @@ import android.telephony.TelephonyManager;
public class Device extends Plugin {
public static final String TAG = "Device";
public static String cordovaVersion = "1.6.1"; // Cordova version
public static String cordovaVersion = "1.7.0rc1"; // Cordova version
public static String platform = "Android"; // Device OS
public static String uuid; // Device UUID