Bryce Curtis 191e1bf150 Merge branch 'master' of github.com:callback/callback-android

2011-10-21 16:44:12 -05:00

..

assets

Load multi-page apps in same webview and update pause/resume for consistency.

2011-10-21 16:29:55 -05:00

libs

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

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

res

forgot to resolve conflict

2011-10-14 15:49:16 -07:00

src/com/phonegap

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

2011-10-21 16:44:12 -05:00

.classpath

Updating to use Android 4.0 build environment

2011-10-20 16:26:30 -04:00

.project

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

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

AndroidManifest.xml

Updating to use Android 4.0 build environment

2011-10-20 16:26:30 -04:00

ant.properties

Updating to use Android 4.0 build environment

2011-10-20 16:26:30 -04:00

build.xml

Merging Simon's fix for Android 4

2011-10-20 13:54:26 -07:00

default.properties

Updating to use Android 4.0 build environment

2011-10-20 16:26:30 -04:00

project.properties

Fixing Project Properties file

2011-10-20 16:48:16 -04:00