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/79f8fb90 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/79f8fb90 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/79f8fb90 Branch: refs/heads/master Commit: 79f8fb9057ae174c8b8c8b1414e247d9871c55e4 Parents: cb64b06 ac0a399 Author: Jesse MacFadyen <[email protected]> Authored: Tue Jun 5 14:10:25 2012 -0700 Committer: Jesse MacFadyen <[email protected]> Committed: Tue Jun 5 14:10:25 2012 -0700 ---------------------------------------------------------------------- VERSION | 2 +- lib/bada/plugin/bada/device.js | 2 +- lib/playbook/plugin/playbook/manager.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
