]> git.parisson.com Git - pdf.js.git/commit
Merge branch 'master' of git://github.com/mozilla/pdf.js into thumb-smooth
authorArtur Adib <arturadib@gmail.com>
Wed, 30 Nov 2011 20:58:44 +0000 (15:58 -0500)
committerArtur Adib <arturadib@gmail.com>
Wed, 30 Nov 2011 20:58:44 +0000 (15:58 -0500)
commit5aad7cb7b561ffba55c6e4e74cbdf7f43b66c032
tree2ddc9033a2ba9b5d96f4636612bcffb68a3ddbbd
parent4369a1a84a8a18bbbcea4e180f8b9eb7fdb99b98
parent12d3a757ff4f00704ad1c2c886a3af86981b588e
Merge branch 'master' of git://github.com/mozilla/pdf.js into thumb-smooth

Conflicts:
web/viewer.js
web/viewer.html
web/viewer.js