[Pkg-mozext-commits] [firebug] 12/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 01861bb41daa10c98cea1bce2cff792f4a82de31
Merge: 0ad579b ce0f78f
Author: Jan Odvarko <odvarko at gmail.com>
Date:   Wed Sep 24 08:03:41 2014 +0200

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

 extension/content/firebug/branch.properties        |  2 +-
 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/netCacheReader.js    |  5 +-
 extension/content/firebug/net/netUtils.js          |  2 +-
 extension/install.rdf                              |  6 +--
 extension/install.rdf.tpl.xml                      |  4 +-
 extension/update.rdf.tpl.xml                       |  2 +-
 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 --------------
 15 files changed, 79 insertions(+), 123 deletions(-)


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