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/15 20:25:05 UTC
[3/3] android commit: Merge branch 'master' into 4.0.x (x86 deploy)
Merge branch 'master' into 4.0.x (x86 deploy)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/a10106c6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/a10106c6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/a10106c6
Branch: refs/heads/4.0.x
Commit: a10106c61a3979ac18f12199a3ce4cc4df60275c
Parents: 4c1efe7 5cb01f2
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Sep 15 14:24:45 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Sep 15 14:24:45 2014 -0400
----------------------------------------------------------------------
bin/templates/cordova/lib/build.js | 15 +++++++++++++++
bin/templates/cordova/lib/device.js | 21 ++++++++++-----------
bin/templates/cordova/lib/emulator.js | 9 ++++++---
3 files changed, 31 insertions(+), 14 deletions(-)
----------------------------------------------------------------------