You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2013/07/28 03:06:04 UTC
[3/5] git commit: Merge branch 'master' into plugman-registry
Merge branch 'master' into plugman-registry
Conflicts:
package.json
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/d527cc84
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/d527cc84
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/d527cc84
Branch: refs/heads/master
Commit: d527cc842138dbbd43128e5bd7b234c382aa9753
Parents: 745b0d8 1148e6f
Author: Anis Kadri <an...@apache.org>
Authored: Wed Jul 24 16:07:14 2013 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Jul 24 16:07:14 2013 -0700
----------------------------------------------------------------------
README.md | 47 ++++++++-
package.json | 5 +-
platforms.js | 16 +--
spec/emulate.spec.js | 21 ----
spec/lazy_load.spec.js | 24 +++++
spec/metadata/blackberry_parser.spec.js | 24 ++---
spec/platform.spec.js | 6 +-
spec/run.spec.js | 21 ----
spec/serve.spec.js | 2 +-
src/config.js | 1 +
src/emulate.js | 14 ---
src/lazy_load.js | 29 ++++--
src/metadata/blackberry10_parser.js | 145 +++++++++++++++++++++++++++
src/metadata/blackberry_parser.js | 144 --------------------------
src/platform.js | 2 +-
src/plugin.js | 5 +-
src/prepare.js | 8 +-
src/ripple.js | 2 +-
src/run.js | 4 +-
19 files changed, 274 insertions(+), 246 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d527cc84/package.json
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/d527cc84/src/plugin.js
----------------------------------------------------------------------