# HG changeset patch
# User Kevin Stange <kevin@simguy.net>
# Date 1177451053 0
# Node ID fea7c90a50670369fa7cff2286f4df9307ed2502
# Parent  de0b9a7c1ee1a0ccb691123cdf2ce22277bdd9b6# Parent  280fac412e385b4cde32542038545aaef4b745b6
merge of '5a49fd68be5cffec6a2aae0c0cc312c64f67138d'
     and '7ad881ace36dfe2627b52ea8a93205957c05d77f'

diff -r de0b9a7c1ee1 -r fea7c90a5067 pidgin/pixmaps/emotes/default/22/theme
--- a/pidgin/pixmaps/emotes/default/22/theme	Tue Apr 24 19:51:09 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/theme	Tue Apr 24 21:44:13 2007 +0000
@@ -41,32 +41,6 @@
 shut-mouth.png      :-X
 glasses-cool.png    8-)
 
-### Following JEP 0038
-[XMPP]
-smile.png           :-)     :)
-sad.png             :-(     :(
-wink.png            ;-)     ;)
-crying.png          :'-(    :'(
-angry.png           >:-(    >:(
-good.png            :yes:
-bad.png             :no:
-#wait.png            :wait:
-rose.png            @->--   :rose:
-phone.png           :telephone:
-mail.png            :email:
-lamp.png            :jabber:
-cake.png            :cake:
-kiss.png            :kiss:
-love.png            :heart:
-love-over.png       :brokenheart:
-musical-note.png    :music:
-beer.png            :beer:
-coffee.png          :coffee:
-coins.png           :money:
-moon.png            :moon:
-sun.png             :sun:
-star.png            :star: 
-
 ### Following Windows Live Messenger 8.1
 [MSN]
 smile.png           :)      :-)