]> git.proxmox.com Git - mirror_xterm.js.git/commitdiff
Merge branch 'master' into 553_find_api
authorDaniel Imms <tyriar@tyriar.com>
Thu, 13 Jul 2017 15:37:04 +0000 (08:37 -0700)
committerGitHub <noreply@github.com>
Thu, 13 Jul 2017 15:37:04 +0000 (08:37 -0700)
1  2 
src/SelectionManager.ts
src/xterm.js

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