]> 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: 33abd69 76a686b)
Merge branch 'master' of https://github.com/sourcelair/xterm.js
authorimoses <ido@twiggle.com>
Thu, 22 Sep 2016 13:28:20 +0000 (16:28 +0300)
committerimoses <ido@twiggle.com>
Thu, 22 Sep 2016 13:28:20 +0000 (16:28 +0300)
1  2 
test/test.js patch | diff1 | diff2 | blob | history

diff --cc test/test.js
Simple merge
xterm.js mirror