]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'master' of git://github.com/mozilla/pdf.js.git into textlayout-ui
authornotmasteryet <async.processingjs@yahoo.com>
Wed, 4 Jan 2012 00:42:13 +0000 (18:42 -0600)
committernotmasteryet <async.processingjs@yahoo.com>
Wed, 4 Jan 2012 00:42:13 +0000 (18:42 -0600)
commitedb0ae4eb830b311da84d1a110ff1c99aa0ebfd2
tree7d1c6b6badc0c3c7bba5e38e66643f46202fcb65
parentcbf4c0393f4296cf24b1898b7f795ee8033f5b11
parent27d2d99bd8960cf786776947dc526467e86ef2cf
Merge branch 'master' of git://github.com/mozilla/pdf.js.git into textlayout-ui

Conflicts:
src/canvas.js
src/canvas.js
web/viewer.js