# HG changeset patch # User Casey Harkins # Date 1178233285 0 # Node ID 25338643b420918d5324d25db8aba66dce1c573d # Parent f4bebd09c6713efd107edaae3aeddab8413aaa0e# Parent b05f0afdc8f145da303849cadece7546ae15ac31 merge of '3e5e8d1aaf2c505b4a94800d8fae315582920517' and 'c5e69cd6bfe3af1f52193d24c9190dec511bf63a' diff -r b05f0afdc8f1 -r 25338643b420 pidgin/pixmaps/emotes/default/22/Makefile.am --- a/pidgin/pixmaps/emotes/default/22/Makefile.am Thu May 03 23:01:05 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/22/Makefile.am Thu May 03 23:01:25 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 b05f0afdc8f1 -r 25338643b420 pidgin/pixmaps/emotes/default/22/goat.png Binary file pidgin/pixmaps/emotes/default/22/goat.png has changed diff -r b05f0afdc8f1 -r 25338643b420 pidgin/pixmaps/emotes/default/22/scalable/Makefile.am --- a/pidgin/pixmaps/emotes/default/22/scalable/Makefile.am Thu May 03 23:01:05 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/Makefile.am Thu May 03 23:01:25 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 b05f0afdc8f1 -r 25338643b420 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 23:01:25 2007 +0000 @@ -0,0 +1,333 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b05f0afdc8f1 -r 25338643b420 pidgin/pixmaps/emotes/default/22/theme --- a/pidgin/pixmaps/emotes/default/22/theme Thu May 03 23:01:05 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/22/theme Thu May 03 23:01:25 2007 +0000 @@ -120,6 +120,7 @@ party.png <:o) eyeroll.png 8-) yawn.png |-) +goat.png (nah) ### Following QQ 2006 [QQ]