You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by br...@apache.org on 2013/01/08 00:10:47 UTC

[4/4] js commit: Merge branch 'master' into slice

Updated Branches:
  refs/heads/master 24d65ab64 -> d40d6a400


Merge branch 'master' into slice


Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/d40d6a40
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/d40d6a40
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/d40d6a40

Branch: refs/heads/master
Commit: d40d6a400020f329d1d61e63b706c9dd6612dd84
Parents: c7e7cea 24d65ab
Author: Braden Shepherdson <br...@chromium.org>
Authored: Mon Jan 7 18:10:28 2013 -0500
Committer: Braden Shepherdson <br...@chromium.org>
Committed: Mon Jan 7 18:10:28 2013 -0500

----------------------------------------------------------------------
 VERSION                                            |    2 +-
 lib/bada/plugin/bada/device.js                     |    2 +-
 lib/blackberry/plugin/air/device.js                |    2 +-
 lib/blackberry/plugin/qnx/device.js                |    2 +-
 lib/blackberry/plugin/qnx/file.js                  |  423 +++++++++++++++
 lib/blackberry/plugin/qnx/manager.js               |    1 +
 lib/blackberry/plugin/qnx/platform.js              |    8 -
 lib/blackberry/plugin/qnx/requestFileSystem.js     |   22 -
 .../plugin/qnx/resolveLocalFileSystemURI.js        |   22 -
 lib/scripts/bootstrap.js                           |    4 +-
 lib/tizen/plugin/tizen/Device.js                   |    2 +-
 test/blackberry/qnx/test.platform.js               |   12 +-
 test/blackberry/qnx/test.requestFileSystem.js      |   32 --
 .../qnx/test.resolveLocalFileSystemURI.js          |   32 --
 14 files changed, 432 insertions(+), 134 deletions(-)
----------------------------------------------------------------------