]> git.proxmox.com Git - mirror_xterm.js.git/commitdiff
Merge remote-tracking branch 'upstream/master' into 455_linkify
authorDaniel Imms <daimms@microsoft.com>
Fri, 17 Feb 2017 18:05:22 +0000 (10:05 -0800)
committerDaniel Imms <daimms@microsoft.com>
Fri, 17 Feb 2017 18:05:22 +0000 (10:05 -0800)
1  2 
src/xterm.css
src/xterm.js

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