Merge remote-tracking branch 'origin/master' into alex/tokenization

2026-04-19 08:08:39 +01:00 · 2017-01-05 12:31:43 +01:00
parent 68b8ad5a37 4496c87db5
commit ebc43b3e8b
200 changed files with 4313 additions and 2328 deletions
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "code-oss-dev",
  "version": "1.9.0",
  "electronVersion": "1.4.6",
-  "distro": "2eecc8b68318fba1fc5b62930287914ac9225e8a",
+  "distro": "ef07477c3bbf2aa2f274b13093cbe0d96fa59fdd",
  "author": {
    "name": "Microsoft Corporation"
  },
@@ -116,4 +116,4 @@
    "windows-mutex": "^0.2.0",
    "fsevents": "0.3.8"
  }
-}
+}