From c7b1db5d52c39e1df34633df867784ee78f0b7d7 Mon Sep 17 00:00:00 2001
From: John Haley <johnh@axosoft.com>
Date: Tue, 10 Feb 2015 09:50:07 -0700
Subject: [PATCH 1/2] Updated some dependencies

---
 generate/templates/partials/callback_helpers.cc |  1 +
 package.json                                    | 15 +++++----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/generate/templates/partials/callback_helpers.cc b/generate/templates/partials/callback_helpers.cc
index 55fa3ed84..e5f383e36 100644
--- a/generate/templates/partials/callback_helpers.cc
+++ b/generate/templates/partials/callback_helpers.cc
@@ -82,6 +82,7 @@ void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbFunction.name }}_asyncAfter(
 
   {{ cbFunction.return.type }} resultStatus;
 
+  {}
   {% each cbFunction|returnsInfo true false as _return %}
     if (result.IsEmpty() || result->IsNativeError()) {
       baton->result = {{ cbFunction.return.error }};
diff --git a/package.json b/package.json
index 980a15c9c..89a38570f 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "node-pre-gyp"
   ],
   "dependencies": {
-    "fs-extra": "~0.15.0",
+    "fs-extra": "^0.15.0",
     "node-pre-gyp": "~0.6.1",
     "nodegit-promise": "~1.0.0",
     "npm": "^2.1.18",
@@ -62,16 +62,16 @@
     "which-native-nodish": "^1.0.3"
   },
   "devDependencies": {
-    "mocha": "~2.1.0",
     "combyne": "~0.6.2",
     "istanbul": "~0.3.2",
     "js-beautify": "^1.5.4",
-    "jshint": "~2.5.6",
+    "jshint": "^2.6.0",
     "lodash": "^2.4.1",
-    "nan": "~1.5.0",
+    "mocha": "~2.1.0",
+    "nan": "^1.6.2",
     "node-gyp": "~1.0.2",
     "nw-gyp": "^0.12.4",
-    "request": "~2.51.0",
+    "request": "^2.53.0",
     "tar": "~1.0.1"
   },
   "binary": {
@@ -85,19 +85,14 @@
     "mocha": "mocha test/runner test/tests",
     "mochaDebug": "mocha --debug-brk test/runner test/tests",
     "test": "npm run lint && npm run cov",
-
     "generateJson": "node generate/scripts/generateJson",
     "generateNativeCode": "node generate/scripts/generateNativeCode",
     "generateMissingTests": "node generate/scripts/generateMissingTests",
-
-
     "prepublish": "node lifecycleScripts/prepareForBuild.js",
     "publish": "node-pre-gyp package && node-pre-gyp publish",
-
     "install": "node lifecycleScripts/install",
     "installDebug": "BUILD_DEBUG=true npm install",
     "postinstall": "node lifecycleScripts/clean",
-
     "recompile": "node-gyp configure build",
     "rebuild": "node generate && node-gyp configure build",
     "recompileDebug": "node-gyp configure --debug build",

From f032b61ce2ad8ee2a6c2ce50595b12c468b4d93b Mon Sep 17 00:00:00 2001
From: John Haley <johnh@axosoft.com>
Date: Tue, 10 Feb 2015 14:25:24 -0700
Subject: [PATCH 2/2] Removed an artifact from the rebase

---
 generate/templates/partials/callback_helpers.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/generate/templates/partials/callback_helpers.cc b/generate/templates/partials/callback_helpers.cc
index e5f383e36..55fa3ed84 100644
--- a/generate/templates/partials/callback_helpers.cc
+++ b/generate/templates/partials/callback_helpers.cc
@@ -82,7 +82,6 @@ void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbFunction.name }}_asyncAfter(
 
   {{ cbFunction.return.type }} resultStatus;
 
-  {}
   {% each cbFunction|returnsInfo true false as _return %}
     if (result.IsEmpty() || result->IsNativeError()) {
       baton->result = {{ cbFunction.return.error }};