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

Merge branch 'master' into 4.0.x (up to 3.7.0-dev)

Browse Source 
Conflicts:
	VERSION
	bin/templates/cordova/version
	framework/src/org/apache/cordova/CordovaWebView.java
	package.json
	test/src/org/apache/cordova/test/basicauth.java
	test/src/org/apache/cordova/test/menus.java
This commit is contained in:
Ian Clelland
2014-09-11 10:16:28 -04:00
parent 31b1a821ca 5a82dd5110
commit 51e634ccb4
7 changed files with 210 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/res/values/strings.xml
View File

@@ -18,5 +18,5 @@
under the License.
-->
<resources>
<string name="app_name">CordovaTests</string>
<string name="app_name">CordovaNativeTests</string>
</resources>