Merge branch 'dep_update' into development
authorJack Allnutt <jack@allnutt.eu>
Sat, 3 Aug 2013 02:44:08 +0000 (03:44 +0100)
committerJack Allnutt <jack@allnutt.eu>
Sat, 3 Aug 2013 02:44:08 +0000 (03:44 +0100)
1  2 
package.json
server/weblistener.js

diff --cc package.json
index 7867dfae9f9e0f89d3123efa656bc613e4dd9d9e,07bc938b8aecf85e58719cd40d792b8408586608..0c0e5a10946be119bb8da11197fc30b65b75a2a3
      "postinstall": "node client/assets/src/build.js"\r
    },\r
    "dependencies": {\r
-     "node-static": "0.5.9",\r
+     "node-static": "0.7.0",\r
      "uglify-js": "2.3.6",\r
      "socket.io": "0.9.16",\r
-     "range_check": "0.0.1",\r
-     "lodash": "0.9.1",\r
-     "daemonize2": "0.4.0-rc.5",\r
-     "eventemitter2": "0.4.11",\r
+     "lodash": "1.3.1",\r
+     "daemonize2": "0.4.2",\r
+     "eventemitter2": "0.4.12",\r
      "ipaddr.js": "0.1.1",\r
 -    "socksjs": "0.4.1"\r
 +    "socksjs": "0.4.1",\r
 +    "iconv-lite" : "0.2.10",\r
-     "spdy": "1.9.1",\r
++    "spdy": "1.10.0",\r
 +    "po2json": "0.0.6"\r
    }\r
  }\r
index ce75b3e247465c495e4fdf06313699f02ae8c54b,89a53d80590f08c92a113138a0ae68bff145c084..b316258d57cc97ae9a93920d4e6f104b12292819
@@@ -7,11 -7,10 +7,11 @@@ var ws          = require('socket.io')
      dns         = require('dns'),
      url         = require('url'),
      _           = require('lodash'),
 +    spdy        = require('spdy'),
+     ipaddr      = require('ipaddr.js'),
      Client      = require('./client.js').Client,
      HttpHandler = require('./httphandler.js').HttpHandler,
-     rehash      = require('./rehash.js'),
-     range_check = require('range_check');
+     rehash      = require('./rehash.js');