Merge branch 'development' of https://github.com/IntelRealSense/libre…

…alsense into remove_workaround
IntelRealSense · Nov 20, 2017 · d231409 · d231409
2 parents 5daf1bd + 58a5c43
commit d231409
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -93,6 +93,7 @@ script:
   # Exit immediately if a command exits with a non-zero status
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       set -e;
+      pyenv install 3.6.1;
       pyenv local `pyenv versions|sed 's/ //g'|grep "^3"|tail -1`;
       mkdir build && cd build;
       cmake .. -DBUILD_EXAMPLES:BOOL=true -DBUILD_PYTHON_BINDINGS:BOOL=true -DBUILD_NODEJS_BINDINGS:BOOL=true;

diff --git a/wrappers/nodejs/package.json b/wrappers/nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-librealsense",
-  "version": "0.279.3",
+  "version": "0.281.0",
   "description": "Node.js API for Intel® RealSense™ SDK 2.0",
   "main": "index.js",
   "directories": {
@@ -25,12 +25,12 @@
   "license": "Apache-2.0",
   "dependencies": {
     "bindings": "^1.2.1",
+    "fs-compare": "0.0.4",
     "jsonfile": "^3.0.1",
+    "nan": "^2.7.0",
     "pngjs": "^3.3.0"
   },
   "devDependencies": {
-    "fs-compare": "0.0.4",
-    "jsdoc": "^3.5.5",
-    "nan": "^2.7.0"
+    "jsdoc": "^3.5.5"
   }
 }