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

[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 61f440356f211193d2de3a0339da6f1dff2927c8
Merge: b6d954b 8f6d557
Author: Jameson Rollins <jrollins at finestructure.net>
Date:   Sun Apr 25 18:29:27 2010 -0400

    Merge branch 'master' into debian

 chrome.manifest                             |   3 +-
 chrome/{locale/en-US => content}/local.css  |  59 ++-
 chrome/content/{logo.png => logo-small.png} | Bin
 chrome/content/logo.png                     | Bin 1631 -> 5536 bytes
 chrome/content/monkeysphere.js              | 614 +++++++---------------------
 chrome/content/monkeysphere.xul             |   6 +-
 chrome/{locale/en-US => content}/title.png  | Bin
 chrome/locale/en-US/dialogs.dtd             |  13 -
 chrome/locale/en-US/help.html               |  57 +--
 chrome/locale/en-US/logo.png                | Bin 5536 -> 0 bytes
 chrome/locale/en-US/style.css               | 330 ---------------
 install.rdf                                 |   8 +-
 modules/monkeysphere.jsm                    | 374 +++++++++++++++++
 13 files changed, 596 insertions(+), 868 deletions(-)

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