# HG changeset patch
# User Kevin Stange <kevin@simguy.net>
# Date 1177391677 0
# Node ID 6ab32b8d32464ddd4e64e6a68b6a240b9d6908cb
# Parent  bf353c85959ac49e33b6db4e66f71fa82fd8c4da# Parent  bf8c596cf0dbf07a491a71ec7256a639bfeb4049
merge of '6096404018084d5ea24f916c8e757d64e237dbd7'
     and 'e50cb51528e4d48fe940dd2aebee80fea945ccd6'

diff -r bf353c85959a -r 6ab32b8d3246 pidgin/pixmaps/emotes/default/22/theme
--- 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