[Pkg-mozext-commits] [firetray] 171/399: Merge branch 'new-messages'

[David Prévot]

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

taffit pushed a commit to branch dfsg-clean
in repository firetray.

commit aec7766bb00492a9757927215a1620b5725abd91
Merge: 9d5c13b 15dace0
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Thu Feb 9 12:19:56 2012 +0100

    Merge branch 'new-messages'

 src/chrome/content/options.js       |   73 +++++++++++++++--------
 src/chrome/content/options.xul      |  111 ++++++++++++++++++++++-------------
 src/chrome/content/overlay.js       |    2 +-
 src/chrome/locale/en-US/options.dtd |   15 +++--
 src/defaults/preferences/prefs.js   |    4 +-
 src/modules/FiretrayHandler.jsm     |   20 ++++---
 src/modules/FiretrayMessaging.jsm   |   70 ++++++++++++----------
 src/modules/commons.js              |   19 +++---
 8 files changed, 196 insertions(+), 118 deletions(-)

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