]> git.proxmox.com Git - mirror_xterm.js.git/commitdiff
projects / mirror_xterm.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7b4c2b 8693d06)
Merge remote-tracking branch 'upstream/master' into 578_ctrl_click_links
authorDaniel Imms <daimms@microsoft.com>
Fri, 3 Mar 2017 01:34:30 +0000 (17:34 -0800)
committerDaniel Imms <daimms@microsoft.com>
Fri, 3 Mar 2017 01:34:30 +0000 (17:34 -0800)
1  2 
src/Linkifier.ts patch | diff1 | diff2 | blob | history

diff --cc src/Linkifier.ts
Simple merge
xterm.js mirror