# HG changeset patch # User Daniel Atallah # Date 1178232424 0 # Node ID f4bebd09c6713efd107edaae3aeddab8413aaa0e # Parent 4d8e7fd6e14d5d6997708308c84a47821482ee9b# Parent a82444e61ece46aca889c2e3f9b6af8db93dc737 merge of '4211727f90723644e020052649b64a5641a1607f' and '7f17dc3d84f61d5fb91677bc6c0f31d55a00ac1d' diff -r a82444e61ece -r f4bebd09c671 pidgin/pixmaps/emotes/default/22/Makefile.am --- a/pidgin/pixmaps/emotes/default/22/Makefile.am Thu May 03 22:07:59 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/22/Makefile.am Thu May 03 22:47:04 2007 +0000 @@ -67,6 +67,7 @@ glasses-cool.png \ glasses-nerdy.png \ go-away.png \ + goat.png \ good.png \ hammer.png \ handcuffs.png \ diff -r a82444e61ece -r f4bebd09c671 pidgin/pixmaps/emotes/default/22/goat.png Binary file pidgin/pixmaps/emotes/default/22/goat.png has changed diff -r a82444e61ece -r f4bebd09c671 pidgin/pixmaps/emotes/default/22/scalable/Makefile.am --- a/pidgin/pixmaps/emotes/default/22/scalable/Makefile.am Thu May 03 22:07:59 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/Makefile.am Thu May 03 22:47:04 2007 +0000 @@ -62,6 +62,7 @@ girl.svg \ glasses-cool.svg \ glasses-nerdy.svg \ + goat.svg \ go-away.svg \ good.svg \ hammer.svg \ diff -r a82444e61ece -r f4bebd09c671 pidgin/pixmaps/emotes/default/22/scalable/goat.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/goat.svg Thu May 03 22:47:04 2007 +0000 @@ -0,0 +1,333 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a82444e61ece -r f4bebd09c671 pidgin/pixmaps/emotes/default/22/theme --- a/pidgin/pixmaps/emotes/default/22/theme Thu May 03 22:07:59 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/22/theme Thu May 03 22:47:04 2007 +0000 @@ -120,6 +120,7 @@ party.png <:o) eyeroll.png 8-) yawn.png |-) +goat.png (nah) ### Following QQ 2006 [QQ]