Merge branch 'master' into benchmark_integration

2019-06-15 22:47:33 -07:00
parent 5f8b7cda04 26c854db49
commit b1004f2007
76 changed files with 892 additions and 635 deletions
@@ -3,6 +3,7 @@
  "description": "Full xterm terminal, in your browser",
  "version": "3.14.0",
  "main": "lib/xterm.js",
+  "style": "css/xterm.css",
  "types": "typings/xterm.d.ts",
  "repository": "https://github.com/xtermjs/xterm.js",
  "license": "MIT",