From: Artur Adib Date: Wed, 30 Nov 2011 20:58:44 +0000 (-0500) Subject: Merge branch 'master' of git://github.com/mozilla/pdf.js into thumb-smooth X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5aad7cb7b561ffba55c6e4e74cbdf7f43b66c032;p=pdf.js.git Merge branch 'master' of git://github.com/mozilla/pdf.js into thumb-smooth Conflicts: web/viewer.js --- 5aad7cb7b561ffba55c6e4e74cbdf7f43b66c032 diff --cc web/viewer.html index ebc0bcb,e441a98..5164d0b --- a/web/viewer.html +++ b/web/viewer.html @@@ -25,9 -25,10 +25,9 @@@ - + -