github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-22 08:53:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	framework/assets/js/cordova.android.js
This commit is contained in:
Simon MacDonald 2012-10-24 16:32:01 -04:00
commit 58f58d9ee8
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
2.2.0rc1 2.2.0rc2

2
bin/templates/project/assets/www/index.html
View File

@ -33,7 +33,7 @@
<p class="event received">Device is Ready</p> <p class="event received">Device is Ready</p>
</div> </div>
</div> </div>
<script type="text/javascript" src="cordova-2.2.0rc1.js"></script> <script type="text/javascript" src="cordova-2.2.0rc2.js"></script>
<script type="text/javascript" src="js/index.js"></script> <script type="text/javascript" src="js/index.js"></script>
<script type="text/javascript"> <script type="text/javascript">
app.initialize(); app.initialize();

2
framework/assets/www/index.html
View File

@ -19,7 +19,7 @@
<html> <html>
<head> <head>
<title></title> <title></title>
<script src="cordova-2.2.0rc1.js"></script> <script src="cordova-2.2.0rc2.js"></script>
</head> </head>
<body> <body>

2
framework/src/org/apache/cordova/Device.java
View File

@ -39,7 +39,7 @@ import android.telephony.TelephonyManager;
public class Device extends CordovaPlugin { public class Device extends CordovaPlugin {
public static final String TAG = "Device"; public static final String TAG = "Device";
public static String cordovaVersion = "2.2.0rc1"; // Cordova version public static String cordovaVersion = "2.2.0rc2"; // Cordova version
public static String platform = "Android"; // Device OS public static String platform = "Android"; // Device OS
public static String uuid; // Device UUID public static String uuid; // Device UUID