[Pkg-mozext-commits] [cookie-monster] 02/05: Merge tag 'upstream/1.3.0.0'

[David Prévot]

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

taffit pushed a commit to branch master
in repository cookie-monster.

commit 246ccd47417a79352b1dbecb266d59cf63503f60
Merge: cad87d1 340b668
Author: David Prévot <david at tilapin.org>
Date:   Sat Jan 9 14:56:53 2016 -0400

    Merge tag 'upstream/1.3.0.0'
    
    Upstream version 1.3.0.0
    
    # gpg: Signature faite le sam. 09 janv. 2016 14:56:49 AST
    # gpg:                avec la clef RSA 058C1CF944F6BD3C
    # gpg: Bonne signature de « David Prévot <david at tilapin.org> »
    # gpg:                 alias « David Prévot <davidp at altern.org> »
    # gpg:                 alias « David Prévot <davidp at no-log.org> »
    # gpg:                 alias « David Prévot <taffit at debian.org> »
    # 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                               |  22 +
 META-INF/mozilla.rsa                               | Bin 0 -> 4197 bytes
 META-INF/mozilla.sf                                |   4 +
 chrome.manifest                                    |   1 +
 chrome/cookiemonster.jar!/content/cookieInfo.js    | 273 ++++++----
 chrome/cookiemonster.jar!/content/cookieMonster.js | 562 +++++++++++----------
 .../content/cookiePreferences.js                   |  45 +-
 chrome/cookiemonster.jar!/content/cookieRequest.js |  67 ++-
 .../cookiemonster.jar!/content/cookieTempAllow.js  | 135 ++---
 chrome/cookiemonster.jar!/content/cookieUtils.js   |  20 +-
 chrome/cookiemonster.jar!/content/options.xul      |   4 +-
 chrome/cookiemonster.jar!/content/overlay.js       |  73 ++-
 chrome/cookiemonster.jar!/content/overlay.xul      | 137 ++---
 .../cookiemonster.jar!/content/overlay_toolbar.xul | 125 ++---
 chrome/cookiemonster.jar!/content/siteCookies.xul  |   4 +-
 chrome/cookiemonster.jar!/locale/de-DE/options.dtd |   3 +-
 chrome/cookiemonster.jar!/locale/de-DE/overlay.dtd |   1 +
 chrome/cookiemonster.jar!/locale/en-US/options.dtd |   3 +-
 chrome/cookiemonster.jar!/locale/en-US/overlay.dtd |   1 +
 chrome/cookiemonster.jar!/locale/fr-FR/options.dtd |   3 +-
 chrome/cookiemonster.jar!/locale/fr-FR/overlay.dtd |   1 +
 chrome/cookiemonster.jar!/locale/it-IT/options.dtd |   3 +-
 chrome/cookiemonster.jar!/locale/it-IT/overlay.dtd |   1 +
 chrome/cookiemonster.jar!/locale/nl-NL/options.dtd |   3 +-
 chrome/cookiemonster.jar!/locale/nl-NL/overlay.dtd |   1 +
 chrome/cookiemonster.jar!/locale/ru-RU/options.dtd |   3 +-
 chrome/cookiemonster.jar!/locale/ru-RU/overlay.dtd |   1 +
 .../locale/zh-CN/cookieMonster.dtd                 |   3 +
 .../locale/zh-CN/cookieMonster.properties          |  41 ++
 chrome/cookiemonster.jar!/locale/zh-CN/options.dtd |  14 +
 chrome/cookiemonster.jar!/locale/zh-CN/overlay.dtd |  28 +
 .../locale/zh-CN/overrideGlobal.dtd                |  18 +
 .../locale/zh-CN/siteCookies.properties            |   6 +
 chrome/cookiemonster.jar!/locale/zh-TW/options.dtd |   3 +-
 chrome/cookiemonster.jar!/locale/zh-TW/overlay.dtd |   1 +
 chrome/cookiemonster.jar!/skin/overlay.css         |   4 +-
 defaults/preferences/defaults.js                   |   1 +
 install.rdf                                        |  14 +-
 38 files changed, 971 insertions(+), 658 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/cookie-monster.git