[Pkg-mozext-commits] [firebug] 06/18: Merge branch 'master' of github.com:firebug/firebug

[David Prévot]

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

taffit pushed a commit to branch master
in repository firebug.

commit bdc392d409dd64082f7e4ae0ebe71ca2978e9593
Merge: a8fb368 2c2c4c6
Author: Jan Odvarko <odvarko at gmail.com>
Date:   Mon May 9 13:34:44 2016 +0200

    Merge branch 'master' of github.com:firebug/firebug

 extension/content/firebug/branch.properties                    | 2 +-
 extension/content/firebug/css/computedPanel.js                 | 1 +
 extension/content/firebug/debugger/script/breakNotification.js | 3 +++
 extension/content/firebug/firefox/external-editors/editors.js  | 2 +-
 extension/content/firebug/lib/url.js                           | 2 +-
 extension/content/firebug/net/netProgress.js                   | 2 ++
 extension/install.rdf                                          | 6 +++---
 extension/install.rdf.tpl.xml                                  | 4 ++--
 extension/update.rdf.tpl.xml                                   | 2 +-
 9 files changed, 15 insertions(+), 9 deletions(-)

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