[1/2] git commit: CB-7383 depend on a newer version of cordova-lib

[marcelk]

Repository: cordova-cli
Updated Branches:
  refs/heads/master b859942ec -> 4afb3a824


CB-7383 depend on a newer version of cordova-lib

(cherry picked from commit e305584f6c8fceed9b929ab509b86e6de14b38e3)

Conflicts:
        npm-shrinkwrap.json
        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/f54682fd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/f54682fd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/f54682fd

Branch: refs/heads/master
Commit: f54682fd4f7ec4f311dfd990e8f4bc1f8db71239
Parents: b859942
Author: Marcel Kinard <cmarc...@gmail.com>
Authored: Tue Sep 16 14:55:51 2014 -0400
Committer: Marcel Kinard <cmarc...@gmail.com>
Committed: Tue Sep 23 16:22:54 2014 -0400

----------------------------------------------------------------------
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/f54682fd/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index ae85efe..7039e2b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova",
-  "version": "3.6.1-0.2.11-dev",
+  "version": "3.6.3-0.2.12",
   "preferGlobal": "true",
   "description": "Cordova command line interface tool",
   "main": "cordova",
@@ -28,7 +28,7 @@
     "cli"
   ],
   "dependencies": {
-    "cordova-lib": "0.21.10",
+    "cordova-lib": "0.21.12",
     "q": "~0.9",
     "nopt": "~2",
     "underscore":"1.4.4"