[Pkg-mozext-commits] [requestpolicy] 37/50: Merge tag 'upstream/1.0.0_beta12.1+dfsg'
David Prévot
taffit at moszumanska.debian.org
Mon Jun 27 12:50:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository requestpolicy.
commit 0d209da4cf3408f9cceb8be6bbcce3b28d0b1b92
Merge: 53b3be3 2b98826
Author: David Prévot <david at tilapin.org>
Date: Fri Jun 24 05:26:59 2016 -0400
Merge tag 'upstream/1.0.0_beta12.1+dfsg'
Upstream version 1.0.0~beta12.1+dfsg
# gpg: Signature faite le ven. 24 juin 2016 05:26:58 AST
# gpg: avec la clef RSA 058C1CF944F6BD3C
# gpg: Bonne signature de « David Prévot <david at tilapin.org> » [inconnu]
# gpg: alias « David Prévot <davidp at altern.org> » [inconnu]
# gpg: alias « David Prévot <davidp at no-log.org> » [inconnu]
# gpg: alias « David Prévot <taffit at debian.org> » [inconnu]
# gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
# gpg: Rien n'indique que la signature appartient à son propriétaire.
# Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF 7E1E B82A 217A FDFE 09F2
# Empreinte de la sous-clef : 7875 4D07 BC09 5C74 48F7 8D66 058C 1CF9 44F6 BD3C
META-INF/manifest.mf | 112 ++++++++++++--------
META-INF/mozilla.rsa | Bin 4191 -> 4191 bytes
META-INF/mozilla.sf | 4 +-
content/controllers/keyboard-shortcuts.jsm | 6 ++
content/lib/classes/keyboard-shortcut.jsm | 7 +-
content/lib/default-preferences.js | 2 +
content/lib/environment.jsm | 2 +-
content/lib/environment.process.js | 3 +-
content/lib/request.jsm | 51 ++++++---
content/lib/ruleset.jsm | 124 ++++++++++------------
content/lib/script-loader.jsm | 7 +-
content/lib/utils.jsm | 2 +-
content/lib/utils/domains.jsm | 26 +++++
content/lib/utils/info.jsm | 5 +-
content/lib/utils/rules.jsm | 78 ++++++++++++++
content/main/about-uri.jsm | 19 +++-
content/main/pref-manager.jsm | 2 +-
content/main/rp-service-2.jsm | 67 ++++++++++++
content/models/prefs.jsm | 2 +
content/settings/common.js | 41 --------
content/settings/oldrules.js | 6 +-
content/settings/yourpolicy.js | 7 +-
content/ui/frame.js | 2 +-
content/ui/menu.js | 26 +----
install.rdf | 6 +-
locale/{es-MX => es-ES}/requestpolicy.dtd | 4 +-
locale/es-ES/requestpolicy.properties | 126 ++++++++++++++++++++++
locale/es-MX/requestpolicy.dtd | 4 +-
locale/es-MX/requestpolicy.properties | 162 ++++++++++++++---------------
locale/fr/requestpolicy.properties | 2 +-
30 files changed, 598 insertions(+), 307 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git
More information about the Pkg-mozext-commits
mailing list