]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'master' of git://github.com/mozilla/pdf.js into text-select
authorArtur Adib <arturadib@gmail.com>
Thu, 1 Dec 2011 15:42:07 +0000 (10:42 -0500)
committerArtur Adib <arturadib@gmail.com>
Thu, 1 Dec 2011 15:42:07 +0000 (10:42 -0500)
commit5e1d78ef20a169a3475f33b330fca503bd8df66f
treeb6dffc7ddbf42635e0949ea772e365241f7fd136
parente2e2240a227f2a838a4fee9481587d668d57747d
parent12d3a757ff4f00704ad1c2c886a3af86981b588e
Merge branch 'master' of git://github.com/mozilla/pdf.js into text-select

Conflicts:
src/canvas.js
src/canvas.js
src/core.js