Merge branch 'master' into 4.0.x (gradle fix)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/6bdc0129 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/6bdc0129 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/6bdc0129 Branch: refs/heads/4.0.x Commit: 6bdc01290ddb5cede4d937783f69fecb505b5078 Parents: 6fb164d ac34bf1 Author: Andrew Grieve <[email protected]> Authored: Tue Sep 16 15:15:11 2014 -0400 Committer: Andrew Grieve <[email protected]> Committed: Tue Sep 16 15:15:11 2014 -0400 ---------------------------------------------------------------------- bin/templates/cordova/lib/build.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
