Merge branch 'master' into gh-pages

2017-01-02 15:17:56 -08:00 · 2017-01-02 15:17:56 -08:00 · a7f9667b55
commit a7f9667b55
parent 61e44fbf1f 0f0b0dfae4
24 changed files with 1070 additions and 915 deletions
--- a/modules/shared/es6/netlib.js
+++ b/modules/shared/es6/netlib.js
@ -33,7 +33,6 @@ if (NODE) {
    var http = require("http");
    var path = require("path");
    var url = require("url");
-    var Str = require("../../shared/es6/strlib");
 }

 class Net {