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

Conflicts:
	framework/src/com/phonegap/ContactManager.java

2010-09-24 13:22:46 -04:00

..

assets

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

2010-09-24 13:22:46 -04:00

gen/com/phonegap

refactored the Command stuff a bit more, added a spashscreen

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

libs

Initial Move of the Javascript OUT of the shared directory: Android

2009-11-17 10:38:49 -08:00

res

refactored the Command stuff a bit more, added a spashscreen

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

src/com/phonegap

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

2010-09-24 13:22:46 -04:00

.classpath

Initial Move of the Javascript OUT of the shared directory: Android

2009-11-17 10:38:49 -08:00

.project

Initial Move of the Javascript OUT of the shared directory: Android

2009-11-17 10:38:49 -08:00

AndroidManifest.xml

Changed to use the Camera Intents to our own peril.

2010-06-04 14:54:16 -07:00

build.xml

refactored the Command stuff a bit more, added a spashscreen

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

default.properties

Updating to 2.2

2010-05-31 10:59:44 -07:00