Mercurial > pidgin
changeset 16347:6ab32b8d3246
merge of '6096404018084d5ea24f916c8e757d64e237dbd7'
and 'e50cb51528e4d48fe940dd2aebee80fea945ccd6'
| author | Kevin Stange <kevin@simguy.net> |
|---|---|
| date | Tue, 24 Apr 2007 05:14:37 +0000 |
| parents | bf353c85959a (current diff) bf8c596cf0db (diff) |
| children | 49e471e56fc7 |
| files | pidgin/pixmaps/emotes/default/22/theme |
| diffstat | 1 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/pixmaps/emotes/default/22/theme Tue Apr 24 03:56:03 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/22/theme Tue Apr 24 05:14:37 2007 +0000 @@ -36,7 +36,7 @@ foot-in-mouth.png :-! embarrassed.png :-[ angel.png O:-) -thinking.png :-\ +thinking.png :-\\ crying.png :'( shut-mouth.png :-X glasses-cool.png 8-) @@ -254,7 +254,7 @@ embarrassed.png :-[ angel.png O:-) shut-mouth.png :-X :X -thinking.png :-\ +thinking.png :-\\ shout.png >:o >:O smile-big.png :-D :D moneymouth.png :-$ @@ -268,14 +268,14 @@ devil.png ]:-> rose.png @}->-- bomb.png @= -good.png *THUMBS UP* +good.png *THUMBS\ UP* beer.png *DRINK* -in-love.png *IN LOVE* +in-love.png *IN\ LOVE* ### Following Yahoo! Messenger 8.1 [Yahoo] smile.png :) :-) -question.png :-/ :-\ +question.png :-/ :-\\ shock.png :-O :O :-o :o devil.png >:) angel.png O:-) o:-) 0:-) @@ -299,7 +299,7 @@ bye.png =; arrogant.png [-( thinking.png :-? -waiting.png :-w :-W +#waiting.png :-w :-W MISSING #at_wits_end ~x( ~X( MISSING: "Why.Does.This.Not.Work.AAAAARGH!!" => angry smily shouting and pulling hair off smile-big.png :D :-D :d :-d tongue.png :-P :P :-p :p @@ -333,7 +333,7 @@ chicken.png ~:> coffee.png ~o) ~O) cow.png 3:-O 3:-o -dance.png \:D/ \:d/ +dance.png \\:D/ \\:d/ rose.png @};- dont-know.png :-L :-l skeleton.png 8-X 8-x @@ -348,9 +348,9 @@ flag.png **== clover.png %%- musical-note.png :-" -nailbiting.png :-SS :-ss -giggle.png ;)) -worship.png ^:)^ +#nailbiting.png :-SS :-ss DUPLICATE DEFINITION/MISSING +#giggle.png ;)) MISSING +#worship.png ^:)^ MISSING star.png (*) #yahoo_madtongue.gif >:P >:p TODO #yahoo_waving.gif >:/ TODO