]> 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>
Sat, 31 Dec 2011 01:22:59 +0000 (19:22 -0600)
committernotmasteryet <async.processingjs@yahoo.com>
Sat, 31 Dec 2011 01:22:59 +0000 (19:22 -0600)
commit877e0f41597478e58879337667071b3f8a5f6269
treebca1b935f020e1a4553d7b66bd60d22461014aa3
parenta52aacab5a8925350e3208a575080f243ff48ccf
parentc0cf081ec0b7728c6a7ae2e2acf053e5debd75da
Merge branch 'master' of git://github.com/mozilla/pdf.js.git into textlayout-ui

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