You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2013/06/25 22:38:27 UTC

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

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-js


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

Branch: refs/heads/2.9.x
Commit: 1fe978d58c93c1db30d0a3b310e32a49016e81c5
Parents: 4770459 a86559a
Author: Joe Bowser <bo...@apache.org>
Authored: Mon May 13 15:31:26 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon May 13 15:31:26 2013 -0700

----------------------------------------------------------------------
 .jshintrc                                       |  2 +-
 Jakefile                                        | 64 +++++++-------------
 VERSION                                         |  2 +-
 build/packager.js                               | 18 +++---
 lib/bada/plugin/bada/device.js                  |  2 +-
 lib/blackberry/plugin/air/device.js             |  2 +-
 lib/blackberry/plugin/qnx/device.js             |  2 +-
 lib/common/plugin/CaptureAudioOptions.js        |  2 -
 lib/common/plugin/CaptureImageOptions.js        |  2 -
 lib/common/plugin/CaptureVideoOptions.js        |  2 -
 lib/common/plugin/device.js                     |  6 +-
 lib/common/plugin/logger.js                     | 48 ++++++++++-----
 lib/common/plugin/notification.js               |  6 +-
 lib/firefoxos/plugin/firefoxos/device.js        |  2 +-
 lib/ios/exec.js                                 | 18 ++++--
 lib/ios/plugin/ios/logger/plugininit.js         |  2 +-
 lib/scripts/plugin_loader.js                    | 36 ++++++-----
 lib/tizen/plugin/tizen/Device.js                |  2 +-
 lib/windows8/platform.js                        |  4 +-
 lib/windows8/plugin/windows8/DeviceProxy.js     |  2 +-
 lib/windowsphone/plugin/file/symbols.js         |  2 -
 .../windowsphone/notification/plugininit.js     | 23 -------
 test/test.notification.js                       |  6 +-
 23 files changed, 119 insertions(+), 136 deletions(-)
----------------------------------------------------------------------