[Pkg-mozext-commits] [firetray] 164/399: Merge branch 'raised'

[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 c2203c063f7a275df190e93742c1d37fd5ba0d06
Merge: e62b23a 616025d
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Sat Feb 4 12:28:58 2012 +0100

    Merge branch 'raised'

 src/chrome/content/options.xul      |    5 ++++
 src/chrome/locale/en-US/options.dtd |    5 +++-
 src/defaults/preferences/prefs.js   |    2 ++
 src/modules/ctypes/x11.jsm          |    9 +++++--
 src/modules/gtk2/FiretrayWindow.jsm |   48 ++++++++++++++++++++++-------------
 5 files changed, 48 insertions(+), 21 deletions(-)

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