commit f54682fd4f7ec4f311dfd990e8f4bc1f8db71239
author Marcel Kinard <cmarcelk@gmail.com> Tue Sep 16 14:55:51 2014 -0400
committer Marcel Kinard <cmarcelk@gmail.com> Tue Sep 23 16:22:54 2014 -0400
tree 60a14804b7c4cb51389c926013f933bdbb78d572
parent b859942eca1612234aa0c6961a769640e9dab8dd

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

(cherry picked from commit e305584f6c8fceed9b929ab509b86e6de14b38e3)

Conflicts:
	npm-shrinkwrap.json
	package.json

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"