[Pkg-privacy-commits] [xul-ext-monkeysphere] 231/296: Merge remote branch 'jrollins/master'

[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 f6d0f8161a5e04a6843a1f982c620e0363d37849
Merge: c807ccf c1033b4
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed May 5 00:31:37 2010 -0400

    Merge remote branch 'jrollins/master'

 Changelog                               |   8 +++
 Makefile                                |  10 +++-
 chrome/content/bad.png                  | Bin 936 -> 0 bytes
 chrome/content/bad.svg                  |   2 +-
 chrome/content/{bad.svg => broken.svg}  |  66 +++++++++++++++++------
 chrome/content/error.png                | Bin 414 -> 0 bytes
 chrome/content/{good.png => monkey.png} | Bin
 chrome/content/monkeysphere.js          |  93 +++++++++++++++++++++++++-------
 chrome/content/monkeysphere.xul         |   3 ++
 modules/monkeysphere.jsm                |   1 +
 10 files changed, 144 insertions(+), 39 deletions(-)

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