cordova-android

mirror of https://github.com/apache/cordova-android.git synced 2025-04-01 04:15:04 +08:00

Go to file

addios 3d9fdef7d3 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

2009-02-27 11:47:10 +07:00

assets

Merge branch 'master' of git://github.com/Indeed/phonegap into phonegap2

2009-02-27 11:47:10 +07:00

bin

Merge branch 'master' of git://github.com/Indeed/phonegap into phonegap2

2009-02-27 11:47:10 +07:00

res

added phonegap icon to demo2

2009-01-16 07:57:14 -06:00

src/com/nitobi/phonegap

Merge branch 'master' of git://github.com/Indeed/phonegap into phonegap2