]> git.parisson.com Git - pdf.js.git/commitdiff
Merge pull request #1781 from brendandahl/app-pref
authorYury Delendik <ydelendik@mozilla.com>
Fri, 1 Jun 2012 23:46:48 +0000 (16:46 -0700)
committerYury Delendik <ydelendik@mozilla.com>
Fri, 1 Jun 2012 23:46:48 +0000 (16:46 -0700)
GH Portion of the Control pdf.js and Other PDF Plugins using Application Preferences bug

1  2 
extensions/firefox/components/PdfStreamConverter.js
web/viewer.js

diff --cc web/viewer.js
Simple merge