You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by gt...@apache.org on 2012/10/05 16:29:29 UTC
[1/2] js commit: Merge branch 'task-cleanup.lint.errors' of
https://github.com/mdineen/incubator-cordova-js into merge
Updated Branches:
refs/heads/master 3e093f720 -> 56e6476b6
Merge branch 'task-cleanup.lint.errors' of https://github.com/mdineen/incubator-cordova-js into merge
Conflicts:
lib/ios/plugin/ios/console.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/56e6476b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/56e6476b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/56e6476b
Branch: refs/heads/master
Commit: 56e6476b61ee3e6744a106605be38541bbbe2a2f
Parents: 3e093f7 3b7d74c
Author: Gord Tanner <gt...@gmail.com>
Authored: Fri Oct 5 10:27:59 2012 -0400
Committer: Gord Tanner <gt...@gmail.com>
Committed: Fri Oct 5 10:27:59 2012 -0400
----------------------------------------------------------------------
lib/android/plugin/android/nativeapiprovider.js | 2 +-
lib/common/channel.js | 6 +-
lib/common/plugin/FileTransfer.js | 2 +-
lib/ios/plugin/ios/console.js | 17 ++--
lib/webworks/java/platform.js | 4 +-
lib/windows8/plugin/windows8/CameraProxy.js | 68 ++++++++--------
lib/windows8/plugin/windows8/CaptureProxy.js | 34 ++++----
lib/windows8/plugin/windows8/MediaFile.js | 12 ++--
lib/windows8/plugin/windows8/MediaProxy.js | 8 +-
lib/windows8/plugin/windows8/NotificationProxy.js | 4 +-
lib/windows8/plugin/windows8/geolocation.js | 4 +-
lib/wp7/platform.js | 2 +-
12 files changed, 81 insertions(+), 82 deletions(-)
----------------------------------------------------------------------