Mercurial > pidgin

changeset 16354:fea7c90a5067

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '5a49fd68be5cffec6a2aae0c0cc312c64f67138d' and '7ad881ace36dfe2627b52ea8a93205957c05d77f'
author Kevin Stange <kevin@simguy.net>
date Tue, 24 Apr 2007 21:44:13 +0000
parents de0b9a7c1ee1 (current diff) 280fac412e38 (diff)
children 69ed7b52faeb
files
diffstat 1 files changed, 0 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- 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           :)      :-)