[Pkg-javascript-commits] [pdf.js] 33/210: Merge pull request #4693 from Snuffleupagus/preferences-reject

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch upstream
in repository pdf.js.

commit 2cdb18bde7d29cae5659e5c5e59e5cdf51f76fd4
Merge: 58f697f 159e86f
Author: Yury Delendik <ydelendik at mozilla.com>
Date:   Mon Apr 28 10:38:12 2014 -0500

    Merge pull request #4693 from Snuffleupagus/preferences-reject
    
    Ensure that the viewer loads even if there are errors when the preferences are read

 web/hand_tool.js | 6 +++---
 web/viewer.js    | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/pdf.js.git