]> git.parisson.com Git - pdf.js.git/commitdiff
Merge branch 'refs/heads/master' into text-select
authorArtur Adib <arturadib@gmail.com>
Mon, 21 Nov 2011 16:45:10 +0000 (11:45 -0500)
committerArtur Adib <arturadib@gmail.com>
Mon, 21 Nov 2011 16:45:10 +0000 (11:45 -0500)
1  2 
src/canvas.js

diff --cc src/canvas.js
Simple merge