CB-7383 merge changes from release branch to master
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/4afb3a82 Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/4afb3a82 Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/4afb3a82 Branch: refs/heads/master Commit: 4afb3a824002c7588e56893c61190c1ddcbe0fdc Parents: f54682f Author: Marcel Kinard <[email protected]> Authored: Tue Sep 23 16:26:45 2014 -0400 Committer: Marcel Kinard <[email protected]> Committed: Tue Sep 23 16:26:45 2014 -0400 ---------------------------------------------------------------------- RELEASENOTES.md | 9 +++++++++ package.json | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/4afb3a82/RELEASENOTES.md ---------------------------------------------------------------------- diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 2bdd628..221db71 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -20,6 +20,15 @@ --> # Cordova-cli Release Notes +### 3.6.1-0.2.13 +* update shrinkwrap + +### 3.6.1-0.2.12 +* CB-7383 depend on a newer version of cordova-lib + +### 3.6.1-0.2.11 +* bump version to 3.6.3-0.2.11 + ### 3.6.1-0.2.10 (Sep 05, 2014) * updated Release notes * updated version to include dev prefix http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/4afb3a82/package.json ---------------------------------------------------------------------- diff --git a/package.json b/package.json index 7039e2b..a7a1b02 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova", - "version": "3.6.3-0.2.12", + "version": "3.6.3-0.2.14-dev", "preferGlobal": "true", "description": "Cordova command line interface tool", "main": "cordova", @@ -28,7 +28,7 @@ "cli" ], "dependencies": { - "cordova-lib": "0.21.12", + "cordova-lib": "0.21.13", "q": "~0.9", "nopt": "~2", "underscore":"1.4.4"
