You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/10/11 02:37:59 UTC

[2/3] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-cli

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


Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/6cdf5e40
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/6cdf5e40
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/6cdf5e40

Branch: refs/heads/master
Commit: 6cdf5e40c354af5fec3888c7ea5fb99422f15975
Parents: 4260a88 9b5f464
Author: Steven Gill <st...@gmail.com>
Authored: Thu Oct 10 16:40:13 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Thu Oct 10 16:40:13 2013 -0700

----------------------------------------------------------------------
 doc/help.txt                            |  6 +-
 spec/config_parser.spec.js              | 96 ++++++++++++++++++++++++++++
 spec/emulate.spec.js                    |  2 +-
 spec/metadata/android_parser.spec.js    | 30 ---------
 spec/metadata/blackberry_parser.spec.js | 36 ++---------
 spec/metadata/ios_parser.spec.js        | 46 -------------
 spec/metadata/wp7_parser.spec.js        |  4 --
 spec/metadata/wp8_parser.spec.js        |  4 --
 spec/prepare.spec.js                    | 30 ++++++++-
 spec/run.spec.js                        |  2 +-
 src/config_parser.js                    | 63 ++++++++++++++++++
 src/emulate.js                          |  6 +-
 src/metadata/android_parser.js          | 39 +----------
 src/metadata/blackberry10_parser.js     | 28 ++------
 src/metadata/ios_parser.js              | 35 ----------
 src/metadata/wp7_parser.js              |  3 -
 src/metadata/wp8_parser.js              |  5 +-
 src/prepare.js                          | 48 +++++++++-----
 src/run.js                              |  6 +-
 src/serve.js                            |  6 +-
 20 files changed, 252 insertions(+), 243 deletions(-)
----------------------------------------------------------------------