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

This commit is contained in:
Daniel Imms
2016-10-31 19:29:36 -07:00
27 changed files with 4843 additions and 98 deletions
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "xterm",
"version": "1.1.3",
"version": "2.0.1",
"ignore": [
"demo",
"test",
".gitignore"
],
"main": "src/xterm.js",
"main": "dist/xterm.js",
"repository": "https://github.com/sourcelair/xterm.js",
"license": "MIT",
"devDependencies": {