[Pkg-javascript-commits] [pdf.js] 129/161: Merge pull request #4518 from Snuffleupagus/firefox-include-default-preferences

[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 483fc9faa0e493bbbad83908b3bb1cd4fc6ca712
Merge: 9a36184 f6cfab0
Author: Yury Delendik <ydelendik at mozilla.com>
Date:   Wed Mar 26 10:04:21 2014 -0500

    Merge pull request #4518 from Snuffleupagus/firefox-include-default-preferences
    
    [Firefox] Stop importing default_preferences.js as a module and include it instead

 extensions/firefox/bootstrap.js      |  2 +-
 extensions/firefox/content/PdfJs.jsm |  2 +-
 make.js                              | 17 ++++++++++-------
 web/default_preferences.js           |  2 --
 4 files changed, 12 insertions(+), 11 deletions(-)

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