[Pkg-mozext-commits] [firetray] 82/399: Merge branch 'UIOptions'

[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 61b8e305ad457008f11ababafddd803c2534eb80
Merge: 8414d7a 96776fe
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Thu Nov 3 22:49:52 2011 +0100

    Merge branch 'UIOptions'
    
    Conflicts:
    	src/modules/FiretrayIconLinux.jsm
    	src/modules/gdk.jsm

 TODO                                |   15 +-
 src/chrome/content/options.js       |  282 ++++++++++++++++++++++++++++++-----
 src/chrome/content/options.xul      |   70 +++++++--
 src/chrome/locale/en-US/options.dtd |   16 +-
 src/chrome/skin/cbox-check.gif      |  Bin 0 -> 54 bytes
 src/chrome/skin/overlay.css         |   37 ++---
 src/defaults/preferences/prefs.js   |    3 +-
 src/modules/FiretrayIconLinux.jsm   |    2 +-
 src/modules/FiretrayMessaging.jsm   |   58 +++----
 src/modules/commons.js              |  116 ++++++++++++--
 10 files changed, 492 insertions(+), 107 deletions(-)

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