You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ka...@apache.org on 2015/03/23 23:03:41 UTC
[7/8] cordova-lib git commit: Merge remote-tracking branch
'origin/copy-from-app-hello-world'
Merge remote-tracking branch 'origin/copy-from-app-hello-world'
Conflicts:
cordova-lib/templates/config.xml
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/6856532f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/6856532f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/6856532f
Branch: refs/heads/master
Commit: 6856532f29b337ee90712b5b298c5a3fa8aa91c3
Parents: f77bd5d 2d9f7a7
Author: Mark Koudritsky <ka...@gmail.com>
Authored: Mon Mar 23 17:36:52 2015 -0400
Committer: Mark Koudritsky <ka...@gmail.com>
Committed: Mon Mar 23 17:36:52 2015 -0400
----------------------------------------------------------------------
cordova-lib/package.json | 1 +
cordova-lib/src/cordova/create.js | 301 ++++++++++++++---------------
cordova-lib/templates/config.xml | 38 ----
cordova-lib/templates/hooks-README.md | 196 -------------------
4 files changed, 146 insertions(+), 390 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6856532f/cordova-lib/package.json
----------------------------------------------------------------------
diff --cc cordova-lib/package.json
index e65a222,ff5b5bf..1506a68
--- a/cordova-lib/package.json
+++ b/cordova-lib/package.json
@@@ -18,8 -18,8 +18,9 @@@
"engineStrict": true,
"dependencies": {
"bplist-parser": "0.0.6",
+ "cordova-app-hello-world": "file:../../cordova-app-hello-world",
"cordova-js": "3.8.0",
+ "cordova-registry-mapper": "1.x",
"d8": "0.4.4",
"dep-graph": "1.1.0",
"elementtree": "0.1.5",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org