]> git.proxmox.com Git - mirror_xterm.js.git/commitdiff
Merge pull request #535 from Tyriar/534_phantomjs
authorDaniel Imms <tyriar@tyriar.com>
Wed, 15 Feb 2017 21:29:50 +0000 (13:29 -0800)
committerGitHub <noreply@github.com>
Wed, 15 Feb 2017 21:29:50 +0000 (13:29 -0800)
Add PhantomJS test support and CharMeasure tests

1  2 
gulpfile.js
package.json

diff --cc gulpfile.js
Simple merge
diff --cc package.json
Simple merge