Simon MacDonald 58f58d9ee8 Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/incubator-cordova-android ...

Conflicts:
	framework/assets/js/cordova.android.js

2012-10-24 16:32:01 -04:00

..

assets

Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/incubator-cordova-android

2012-10-24 16:32:01 -04:00

res

Updating the config.xml default to be true. See discussion on CB-1611

2012-10-19 07:23:55 -07:00

src/org/apache/cordova

Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/incubator-cordova-android

2012-10-24 16:32:01 -04:00

test/org/apache/cordova

CB-3: Apache source headers in callback-android

2012-02-23 11:36:08 -05:00

.classpath

Update .classpath file to use commons-codec-1.7.jar

2012-09-28 14:27:38 -04:00

.project

Changing all tabs to spaces

2012-06-05 09:49:50 -04:00

AndroidManifest.xml

Modify min sdk version in AndroidManifest.xml

2012-08-13 13:27:34 -04:00

ant.properties

CB-3: Apache source headers in callback-android

2012-02-23 11:36:08 -05:00

build.xml

Fail the build gracefully with helpful error messages if the local.properties

2012-09-25 13:09:40 -04:00

default.properties

Changing all tabs to spaces

2012-06-05 09:49:50 -04:00

project.properties

Make Eclipse recognize framework as a library project

2012-08-20 14:22:48 -04:00