[Pkg-javascript-commits] [pdf.js] 34/174: Merge pull request #6489 from Snuffleupagus/bug-1202902

[David Prévot]

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

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

commit 09c1fc51f18f9da05f9117d06d2f9764e0250026
Merge: 1bdfc47 26ec36b
Author: Yury Delendik <ydelendik at mozilla.com>
Date:   Thu Oct 1 11:44:28 2015 -0500

    Merge pull request #6489 from Snuffleupagus/bug-1202902
    
    Upstream changes from Bug 1202902 - Give loader scripts and XUL frame scripts a lexical scope that doesn't break everything?

 extensions/firefox/content/PdfJs-stub.jsm        | 2 +-
 extensions/firefox/content/PdfJs.jsm             | 4 ++--
 extensions/firefox/content/PdfjsChromeUtils.jsm  | 2 +-
 extensions/firefox/content/PdfjsContentUtils.jsm | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

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