[Pkg-mozext-commits] [firebug] 17/56: 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 7b2724be1cc49dbae95b7d0701d9e340a4639895
Merge: 7ba334f da74c9f
Author: Jan Odvarko <odvarko at gmail.com>
Date:   Mon Sep 29 16:02:11 2014 +0200

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

 extension/content/firebug/cookies/cookieUtils.js   |   56 +-
 .../content/firebug/debugger/script/sourceTool.js  |   15 +-
 extension/content/firebug/lib/url.js               |    2 +-
 extension/content/firebug/net/netUtils.js          |    2 +-
 extension/locale/fr/firebug-amo.properties         |    4 +-
 extension/locale/fr/firebug.properties             | 1040 +++++++++++++++-----
 tests/content/css/3652/issue3652.html              |   12 +-
 tests/content/css/3652/issue3652.js                |   19 +-
 tests/content/firebug.html                         |    1 -
 tests/content/script/callstack/5400/issue5400.js   |    2 +-
 tests/content/script/watch/7300/issue7300.html     |   38 -
 tests/content/script/watch/7300/issue7300.js       |   36 -
 12 files changed, 877 insertions(+), 350 deletions(-)

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