]> git.proxmox.com Git - mirror_xterm.js.git/commitdiff
Merge remote-tracking branch 'ups/master' into 207_selection_manager
authorDaniel Imms <daimms@microsoft.com>
Sat, 20 May 2017 01:38:24 +0000 (18:38 -0700)
committerDaniel Imms <daimms@microsoft.com>
Sat, 20 May 2017 01:38:24 +0000 (18:38 -0700)
1  2 
src/xterm.css
src/xterm.js

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