Andrew Grieve 87cdc5ad1c Merge branch 'master' into 4.0.x (SplashScreen breakout) ... Conflicts: framework/src/org/apache/cordova/CordovaActivity.java framework/src/org/apache/cordova/CordovaWebView.java		2014-12-10 16:09:22 -05:00
..
lib	Merge branch 'master' into 4.0.x (SplashScreen breakout)	2014-12-10 16:09:22 -05:00
build	CB-3445 Add gradle support clean command (plus some code cleanup)	2014-08-18 16:19:40 -04:00
build.bat	CB-5209 Win: Cannot build Android app if project path contains spaces	2013-10-29 16:29:19 -04:00
clean	CB-3445 Add gradle support clean command (plus some code cleanup)	2014-08-18 16:19:40 -04:00
clean.bat	CB-5209 Win: Cannot build Android app if project path contains spaces	2013-10-29 16:29:19 -04:00
defaults.xml	Move registration of App plugin from config.xml -> code	2014-07-08 11:47:26 -04:00
log	Refactoring Android project-level and platform scripts to use Q.js	2013-10-16 13:10:53 -04:00
log.bat	CB-5209 Win: Cannot build Android app if project path contains spaces	2013-10-29 16:29:19 -04:00
run	CB-6876 Fix the "print usage"	2014-06-04 19:12:55 -04:00
run.bat	CB-5209 Win: Cannot build Android app if project path contains spaces	2013-10-29 16:29:19 -04:00
version	Set VERSION to 3.7.0-dev (via coho)	2014-08-29 16:34:12 -07:00
version.bat	CB-5209 Win: Cannot build Android app if project path contains spaces	2013-10-29 16:29:19 -04:00