github/cordova-android
4
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' into 4.0.x (App plugin from config.xml -> code)

Browse Source 
Conflicts:
	bin/templates/cordova/defaults.xml
	framework/res/xml/config.xml
	framework/src/org/apache/cordova/CordovaWebView.java
This commit is contained in:
Andrew Grieve
2014-07-08 11:52:44 -04:00
parent 67006add53 e86c2e5970
commit 9c5e340fb8
5 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/res/xml/config.xml
-3
View File
@@ -36,7 +36,4 @@
<feature name="PluginStub">
<param name="android-package" value="org.apache.cordova.pluginApi.pluginStub" />
</feature>
<feature name="App">
<param name="android-package" value="org.apache.cordova.App" />
</feature>
</widget>