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:26 UTC
[3/9] js commit: Fixing merge conflicts from not updating VERSION
Fixing merge conflicts from not updating VERSION
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/47704596
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/47704596
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/47704596
Branch: refs/heads/2.9.x
Commit: 477045961d90ab2c9e1479cb60dbe991b26142fe
Parents: da1caec 360bd3e
Author: Joe Bowser <bo...@apache.org>
Authored: Fri Apr 19 17:54:54 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri Apr 19 17:54:54 2013 -0700
----------------------------------------------------------------------
VERSION | 2 +-
lib/bada/plugin/bada/device.js | 2 +-
lib/blackberry/plugin/air/device.js | 2 +-
lib/blackberry/plugin/qnx/device.js | 2 +-
lib/tizen/plugin/tizen/Device.js | 2 +-
lib/windows8/plugin/windows8/DeviceProxy.js | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------