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 2013/03/20 16:49:00 UTC
[16/40] js commit: Merge branch 'master' into next
Merge branch 'master' into next
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/c5437f05
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/c5437f05
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/c5437f05
Branch: refs/heads/cb2227
Commit: c5437f050947a65045222c6ac9fa70cf71ba334e
Parents: 03a4b30 81e89d6
Author: Gord Tanner <gt...@gmail.com>
Authored: Wed Feb 27 13:07:16 2013 -0800
Committer: Gord Tanner <gt...@gmail.com>
Committed: Wed Feb 27 13:07:16 2013 -0800
----------------------------------------------------------------------
lib/android/exec.js | 2 +-
lib/bada/plugin/bada/device.js | 3 -
lib/common/channel.js | 4 ++
lib/common/plugin/FileTransfer.js | 4 +-
lib/common/plugin/echo.js | 25 +++++++--
lib/cordova.js | 10 ++--
lib/ios/exec.js | 37 ++++++++++----
lib/scripts/bootstrap.js | 86 +++++++++++++++++++-------------
test/android/test.exec.js | 30 ++++++------
9 files changed, 125 insertions(+), 76 deletions(-)
----------------------------------------------------------------------