You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ma...@apache.org on 2012/08/17 17:53:14 UTC
[1/2] js commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-cordova-js
Updated Branches:
refs/heads/master 5fecf16a6 -> 993c3aec5
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-js
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/commit/993c3aec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/993c3aec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/993c3aec
Branch: refs/heads/master
Commit: 993c3aec5330824002f29e9318f291840b4b11f3
Parents: 114232a 5fecf16
Author: macdonst <si...@gmail.com>
Authored: Fri Aug 17 11:36:22 2012 -0400
Committer: macdonst <si...@gmail.com>
Committed: Fri Aug 17 11:36:22 2012 -0400
----------------------------------------------------------------------
lib/android/exec.js | 180 +++++++++++++++++++--------
lib/android/platform.js | 23 +---
lib/android/plugin/android/callback.js | 138 ++++++++++----------
lib/android/plugin/android/polling.js | 55 ++++----
lib/common/plugin/echo.js | 14 ++
lib/cordova.js | 4 -
6 files changed, 239 insertions(+), 175 deletions(-)
----------------------------------------------------------------------