Anis Kadri 5faed8378c Merge branch 'master' of github.com:phonegap/phonegap-android ...

Conflicts:
	framework/res/xml/phonegap.xml
	framework/src/com/phonegap/DroidGap.java

2011-10-14 15:43:13 -07:00

..

drawable

refactored the Command stuff a bit more, added a spashscreen

2010-08-24 18:58:16 -07:00

layout

refactored the Command stuff a bit more, added a spashscreen

2010-08-24 18:58:16 -07:00

values

sweet one line building!

2010-01-27 15:00:21 -08:00

xml

Merge branch 'master' of github.com:phonegap/phonegap-android

2011-10-14 15:43:13 -07:00