cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [3/4] git commit: fix merge issue and make tabs 4 spaces
Date Thu, 18 Sep 2014 23:16:31 GMT
fix merge issue and make tabs 4 spaces


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

Branch: refs/heads/master
Commit: f4ebe0fef928490332ed0d39d7a2df4900e5a021
Parents: e3ccdb4 93d463d
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Thu Sep 18 16:15:40 2014 -0700
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Thu Sep 18 16:15:40 2014 -0700

----------------------------------------------------------------------
 windows/VERSION                                 |   2 +-
 windows/package.json                            |  10 +-
 .../cordova/lib/ApplyPlatformConfig.ps1         | 305 -------------------
 windows/template/cordova/lib/ConfigParser.js    |  22 ++
 windows/template/cordova/lib/build.js           |  13 +-
 windows/template/cordova/lib/prepare.js         | 261 ++++++++++++++++
 windows/template/cordova/lib/utils.js           |  14 -
 7 files changed, 291 insertions(+), 336 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/f4ebe0fe/windows/package.json
----------------------------------------------------------------------
diff --cc windows/package.json
index 9bcd619,af0a941..86253d9
--- a/windows/package.json
+++ b/windows/package.json
@@@ -1,32 -1,26 +1,26 @@@
  {
 -  "name": "cordova-windows",
 -  "version": "3.7.0-dev",
 -  "description": "cordova-windows release",
 -  "main": "bin/create",
 -  "repository":{
 -    "type":"git",
 -    "url":"https://github.com/apache/cordova-windows"
 -  },
 -  "keywords": [
 -    "windows",
 -    "cordova",
 -    "apache"
 -  ],
 -  "dependencies": {
 -    "q": "^0.9.0",
 -    "nopt": "~3",
 -    "node-uuid": "~1.4",
 -    "shelljs": "~0.3"
 -  },
 -  "scripts": {
 -    "test": "bin\\create .\\testcreate & .\\testcreate\\cordova\\build & rm -rf
.\\testcreate"
 -  },
 -  "author": "Apache Software Foundation",
 -  "license": "Apache Version 2.0"
 +    "name": "cordova-windows",
-     "version": "3.6.0-dev",
-     "description": "cordova-windows dev",
++    "version": "3.7.0-dev",
++    "description": "cordova-windows release",
 +    "main": "bin/create",
 +    "repository":{
 +        "type":"git",
 +        "url":"https://github.com/apache/cordova-windows"
 +    },
 +    "keywords": [
 +        "windows",
 +        "cordova",
 +        "apache"
 +    ],
 +    "dependencies": {
 +        "q": "^0.9.0",
 +        "nopt": "~3",
 +        "node-uuid": "~1.4",
 +        "shelljs": "~0.3"
 +    },
-     "bundledDependencies": [
-         "nopt",
-         "shelljs",
-         "node-uuid",
-         "q"
-     ],
 +    "scripts": {
 +        "test": "bin\\create .\\testcreate & .\\testcreate\\cordova\\build & rm
-rf .\\testcreate"
 +    },
 +    "author": "Apache Software Foundation",
 +    "license": "Apache Version 2.0"
  }


Mime
View raw message