]> 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: 3618941 6b3ddb9)
Merge branch 'master' into 612_multiple_links_in_row
authorDaniel Imms <tyriar@tyriar.com>
Tue, 4 Apr 2017 16:00:47 +0000 (09:00 -0700)
committerGitHub <noreply@github.com>
Tue, 4 Apr 2017 16:00:47 +0000 (09:00 -0700)
1  2 
src/Linkifier.ts patch | diff1 | diff2 | blob | history

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