[Pkg-mozext-commits] [greasemonkey] 38/41: Merge tag 'upstream/3.2_beta1'

[David Prévot]

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

taffit pushed a commit to branch master
in repository greasemonkey.

commit 2d2690e612bf692d8b2b13ccdccc9f3d62b247e3
Merge: 78cca7f f7562f2
Author: David Prévot <david at tilapin.org>
Date:   Thu Apr 30 15:02:07 2015 -0400

    Merge tag 'upstream/3.2_beta1'
    
    Upstream version 3.2~beta1
    
    # gpg: Signature faite le jeu. 30 avril 2015 15:01:57 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

 components/greasemonkey.js         | 14 +++++++--
 content/addons4-overlay.js         |  3 +-
 content/bindings.xml               | 39 +++++++++++++++++++++++--
 content/browser.js                 | 39 ++++++++++++++++---------
 content/config.js                  | 19 ++++++++++++
 content/framescript.js             | 32 ++++++++++++++-------
 content/menucommander.js           | 12 ++++----
 content/scriptprefs.js             | 19 ++++++++++++
 content/scriptprefs.xul            | 24 ++++++++++++----
 install.rdf                        |  4 +--
 locale/cs/gm-cludes.dtd            |  2 ++
 locale/en-US/gm-cludes.dtd         |  2 ++
 modules/installPolicy.js           | 31 ++++++++++----------
 modules/ipcscript.js               |  7 +++--
 modules/miscapis.js                | 20 ++-----------
 modules/remoteScript.js            |  1 +
 modules/sandbox.js                 |  3 +-
 modules/script.js                  | 42 ++++++++++++++++++++++-----
 modules/stats.js                   |  1 +
 modules/storageFront.js            |  2 ++
 modules/sync.js                    |  9 +++++-
 modules/util.js                    | 59 +++++++++++++++++++++++++++++++-------
 modules/util/findMessageManager.js | 12 +++++---
 modules/util/parseMetaLine.js      |  2 +-
 modules/util/showInstallDialog.js  |  4 +--
 modules/xmlhttprequester.js        | 17 +++++++++--
 skin/bindings.css                  | 16 +++++++----
 27 files changed, 319 insertions(+), 116 deletions(-)

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