Bryce Curtis d44d9ddca6 Merge branch 'CordovaWebView' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android into CordovaWebView ...

Conflicts:
	framework/src/org/apache/cordova/FileUtils.java
	framework/src/org/apache/cordova/GeoListener.java
	framework/src/org/apache/cordova/GpsListener.java
	framework/src/org/apache/cordova/NetworkListener.java

2012-05-14 23:16:32 -05:00

..

assets

Merging master into CordovaWebView

2012-05-11 10:36:17 -07:00

res

Working on CB-585

2012-05-04 11:18:19 -07:00

src

Merge branch 'CordovaWebView' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android into CordovaWebView

2012-05-14 23:16:32 -05:00

test/org/apache/cordova

CB-3: Apache source headers in callback-android

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

.classpath

Modifying generated classpath

2012-05-07 15:52:49 -07:00

.project

Rename to Cordova

2012-02-03 10:38:40 -05:00

AndroidManifest.xml

CB-3: Apache source headers in callback-android

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

ant.properties

CB-3: Apache source headers in callback-android

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

build.xml

Automatically update index.html in templates directory on version change

2012-04-13 16:36:46 -04:00

default.properties

Updating to use Android 4.0 build environment

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

project.properties

[CB-683] updating JS for fix for 683

2012-05-10 16:43:08 -07:00