[Pkg-privacy-commits] [xul-ext-monkeysphere] 266/296: Merge branch 'master' into HEAD

[Ximin Luo]

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

infinity0 pushed a commit to branch debian
in repository xul-ext-monkeysphere.

commit 51f3c2cb00203605b58e2d2b7cff1144a6026777
Merge: 4f9c306 2c7ac4e
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Thu Dec 16 11:02:11 2010 -0500

    Merge branch 'master' into HEAD

 .dir-locals.el                       |   3 +
 Changelog                            |  21 ++++--
 Makefile                             |   2 +-
 chrome.manifest                      |   1 +
 chrome/content/help.xhtml            |  57 +++++++++++++++
 chrome/content/local.css             |  93 ++++++++++++-------------
 chrome/content/logo.png              | Bin 5536 -> 8087 bytes
 chrome/content/monkeysphere.js       | 131 +++++++++++++++++++++++++++--------
 chrome/content/monkeysphere.xul      |  17 ++---
 chrome/locale/en-US/help.dtd         |  16 +++++
 chrome/locale/en-US/help.html        |  50 -------------
 chrome/locale/en-US/messages         |   7 ++
 chrome/locale/en-US/messages.dtd     |   8 +++
 chrome/locale/fr-FR/help.dtd         |  17 +++++
 chrome/locale/fr-FR/messages         |  18 +++++
 chrome/locale/fr-FR/messages.dtd     |   8 +++
 chrome/locale/nl-NL/help.dtd         |  17 +++++
 chrome/locale/nl-NL/messages         |  18 +++++
 chrome/locale/nl-NL/messages.dtd     |   8 +++
 defaults/preferences/monkeysphere.js |   1 +
 install.rdf.template                 |  20 +++++-
 modules/monkeysphere.jsm             |  88 +++++++++++++++--------
 22 files changed, 432 insertions(+), 169 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/xul-ext-monkeysphere.git