]> git.proxmox.com Git - mirror_xterm.js.git/commitdiff
Merge remote-tracking branch 'ups/master' into 207_selection_manager
authorDaniel Imms <daimms@microsoft.com>
Tue, 6 Jun 2017 21:35:06 +0000 (14:35 -0700)
committerDaniel Imms <daimms@microsoft.com>
Tue, 6 Jun 2017 21:35:06 +0000 (14:35 -0700)
1  2 
src/handlers/Clipboard.ts
src/xterm.js

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