[Pkg-mozext-commits] [firetray] 382/399: Merge branch 'fade'

[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 2749816a4d438733fd03e7110d918d9f18dd1e09
Merge: 91792af 35ed1ef
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Wed Jul 24 15:38:17 2013 +0200

    Merge branch 'fade'
    
    Conflicts:
    	src/modules/linux/FiretrayChatStatusIcon.jsm

 src/chrome/content/options.js                |   45 +++++-
 src/chrome/content/options.xul               |   26 +++-
 src/chrome/locale/en-US/options.dtd          |    8 ++
 src/defaults/preferences/prefs.js            |    2 +
 src/modules/FiretrayChat.jsm                 |   65 ++++++---
 src/modules/FiretrayHandler.jsm              |   26 +++-
 src/modules/commons.js                       |    5 +
 src/modules/ctypes/linux/gdk.jsm             |    5 +-
 src/modules/linux/FiretrayChatStatusIcon.jsm |  195 ++++++++++++++++++++++++--
 src/modules/linux/FiretrayStatusIcon.jsm     |    3 +-
 src/modules/linux/FiretrayWindow.jsm         |    2 +-
 src/modules/logging.jsm                      |    2 +-
 12 files changed, 349 insertions(+), 35 deletions(-)


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