You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2012/08/17 20:37:56 UTC

[1/10] js commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-js

Updated Branches:
  refs/heads/master d5a72028f -> 19b4203af


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/19b4203a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/19b4203a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/19b4203a

Branch: refs/heads/master
Commit: 19b4203afe97c6a2159eff7fe482bfb047d50fa0
Parents: 231b8d2 d5a7202
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Fri Aug 17 11:35:47 2012 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Fri Aug 17 11:35:47 2012 -0700

----------------------------------------------------------------------
 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/Media.js                         |   11 +-
 lib/common/plugin/echo.js                          |   14 ++
 lib/cordova.js                                     |    4 -
 lib/ios/exec.js                                    |   77 +++++--
 lib/ios/platform.js                                |    3 +
 lib/ios/plugin/ios/contacts.js                     |   14 +-
 lib/playbook/plugin/manager.js                     |    3 +-
 lib/playbook/plugin/playbook/FileTransfer.js       |  140 +++++++++++
 lib/playbook/plugin/playbook/FileWriter.js         |   16 +-
 .../plugin/playbook/resolveLocalFileSystemURI.js   |    8 +
 14 files changed, 480 insertions(+), 206 deletions(-)
----------------------------------------------------------------------