[Pkg-javascript-commits] [pdf.js] 50/246: Merge pull request #5082 from Rob--W/chromium-managed-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 bf3aad8a95417c746101fcbd12887c02a1503668
Merge: 1911bb2 0074601
Author: Tim van der Meij <timvandermeij at gmail.com>
Date:   Wed Jul 30 23:58:25 2014 +0200

    Merge pull request #5082 from Rob--W/chromium-managed-preferences
    
    Managed preferences for Chrome administrators

 extensions/chromium/manifest.json           |  3 ++
 extensions/chromium/preferences_schema.json | 68 +++++++++++++++++++++++++++++
 web/default_preferences.js                  |  3 ++
 web/preferences.js                          | 41 ++++++++++++++++-
 4 files changed, 114 insertions(+), 1 deletion(-)


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