Merge remote-tracking branch 'upstream/master' into typescript_build_2

2016-11-12 13:46:59 -08:00
parent 5ddb33419e bc10fbdfae
commit bf4ef599ad
12 changed files with 349 additions and 128 deletions
@@ -1,6 +1,6 @@
 {
  "name": "xterm",
-  "version": "2.0.1",
+  "version": "2.1.0",
  "ignore": [
    "demo",
    "test",