]> git.proxmox.com Git - mirror_xterm.js.git/commitdiff
Merge remote-tracking branch 'upstream/master' into 124_add_textarea_back
authorDaniel Imms <daimms@microsoft.com>
Fri, 15 Jul 2016 17:13:56 +0000 (10:13 -0700)
committerDaniel Imms <daimms@microsoft.com>
Fri, 15 Jul 2016 17:13:56 +0000 (10:13 -0700)
1  2 
src/xterm.js
test/test.js

diff --cc src/xterm.js
Simple merge
diff --cc test/test.js
Simple merge