mirror of
https://github.com/apache/cordova-android.git
synced 2026-05-11 00:00:05 +08:00
Merge branch 'master' of git://github.com/Indeed/phonegap into phonegap2
Conflicts: android/assets/gap.js android/assets/index.html android/bin/DroidGap.apk android/bin/classes.dex android/bin/com/nitobi/phonegap/PhoneGap$1.class android/bin/com/nitobi/phonegap/PhoneGap$2.class android/bin/com/nitobi/phonegap/PhoneGap.class android/bin/resources.ap_ android/src/com/nitobi/phonegap/PhoneGap.java
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user