Merge branch 'dynnode' into script

This commit is contained in:
Braydon Fuller 2015-07-09 12:51:17 -04:00
commit f488f3ff62
2 changed files with 3 additions and 2 deletions

View File

@ -6,7 +6,7 @@
var net = require('net'); var net = require('net');
var EventEmitter = require('events').EventEmitter; var EventEmitter = require('events').EventEmitter;
var bitcoindjs = require('../build/Debug/bitcoindjs.node'); var bitcoindjs = require('bindings')('bitcoindjs.node');
var util = require('util'); var util = require('util');
var fs = require('fs'); var fs = require('fs');
var mkdirp = require('mkdirp'); var mkdirp = require('mkdirp');

View File

@ -33,8 +33,9 @@
"bitcoind" "bitcoind"
], ],
"dependencies": { "dependencies": {
"nan": "1.3.0", "bindings": "^1.2.1",
"mkdirp": "0.5.0", "mkdirp": "0.5.0",
"nan": "1.3.0",
"tiny": "0.0.10" "tiny": "0.0.10"
}, },
"devDependencies": { "devDependencies": {