[Pkg-mozext-commits] [firetray] 22/33: Merge branch 'prefpane'

[David Prévot]

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

taffit pushed a commit to branch master
in repository firetray.

commit 26a52824dfdd6852dfdd503c6a21052718794cb9
Merge: 7da9697 86f161e
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Mon Sep 7 23:43:04 2015 +0200

    Merge branch 'prefpane'

 src/chrome/content/options.js  |  20 ++-
 src/chrome/content/options.xul | 329 +++++++++++++++++++++--------------------
 2 files changed, 182 insertions(+), 167 deletions(-)

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