Merge branch 'feature-threading'

gchq · Sep 19, 2017 · b13917f · b13917f
2 parents 83d258c + 9028761
commit b13917f
Show file tree

Hide file tree

Showing 48 changed files with 3,337 additions and 1,845 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,2 @@
 src/core/lib/**
+src/core/config/MetaConfig.js
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -97,6 +97,9 @@
 
         "COMPILE_TIME": false,
         "COMPILE_MSG": false,
-        "PKG_VERSION": false
+        "PKG_VERSION": false,
+        "ENVIRONMENT_IS_WORKER": false,
+        "ENVIRONMENT_IS_NODE": false,
+        "ENVIRONMENT_IS_WEB": false
     }
 }
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ docs/*
 !docs/*.conf.json
 !docs/*.ico
 .vscode
+src/core/config/MetaConfig.js