You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/09/24 22:19:43 UTC
[5/5] android commit: Merge branch 'master' into 4.0.x (per-arch
gradle builds)
Merge branch 'master' into 4.0.x (per-arch gradle builds)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/6d5b88d7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/6d5b88d7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/6d5b88d7
Branch: refs/heads/4.0.x
Commit: 6d5b88d7b9950fae46c6fb7a3b3dbff0aa1b0aef
Parents: f7f49d2 a986e72
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed Sep 24 16:18:51 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed Sep 24 16:18:51 2014 -0400
----------------------------------------------------------------------
bin/templates/cordova/lib/build.js | 56 ++++++++++-----
bin/templates/cordova/lib/device.js | 73 +++++++++++--------
bin/templates/cordova/lib/emulator.js | 75 +++++++++++---------
bin/templates/cordova/lib/run.js | 109 ++++++++++++++---------------
4 files changed, 174 insertions(+), 139 deletions(-)
----------------------------------------------------------------------