pidgin: 1cb5c4ca: I think this should be thunder, thus add...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 1cb5c4ca943e9f7ecd09da32a34b562f4e52269d
Parent:   76154ab665d09f6bdf5261f695f47413a22f9f4e
Author:   qulogic at pidgin.im
Date:     08/28/10 03:17:13
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1cb5c4ca943e9f7ecd09da32a34b562f4e52269d

Changelog: 

I think this should be thunder, thus adding more links.

Changes against parent 76154ab665d09f6bdf5261f695f47413a22f9f4e

  added    pidgin/pixmaps/emotes/small/16/thunder.png
  patched  pidgin/pixmaps/emotes/small/16/Makefile.am
  patched  pidgin/pixmaps/emotes/small/16/small.theme.in
  attr on  pidgin/pixmaps/emotes/small/16/thunder.png
      set  mtn:manual_merge
       to  true

-------------- next part --------------
============================================================
--- pidgin/pixmaps/emotes/small/16/small.theme.in	f28a3d7735f7f7a565414b5dc0943cb441f43ec7
+++ pidgin/pixmaps/emotes/small/16/small.theme.in	4c266db50e28dc08aa319af3485377e5b65ba5e8
@@ -108,7 +108,9 @@ thinking.png        *-)
 mobile.png          (mp)
 dont-know.png       :^)
 thinking.png        *-)
+thunder.png         (li)
 party.png           <:o)
+eyeroll.png         8-)
 sleepy.png          |-) 
 
 # Hidden MSN emotes
@@ -139,6 +141,7 @@ lamp.png            /!       /dp       /
 search.png          /find    /zhao     /search
 hug-left.png        /hug     /yb       /hug
 lamp.png            /!       /dp       /lightbulb
+thunder.png         /li      /shd      /lightning
 musical-note.png    /music   /yy       /music
 coffee.png          /coffee  /kf       /coffee
 hungry.png          /eat     /fan      /eat
============================================================
--- pidgin/pixmaps/emotes/small/16/Makefile.am	a6f2f126850a3d4b315a4d129503fb15bc0c7009
+++ pidgin/pixmaps/emotes/small/16/Makefile.am	0cce76c83f7aeef838d2fe2beb4cff9bc01712e2
@@ -75,6 +75,7 @@ SMILEYS = \
     star.png \
     stressed.png \
     thinking.png \
+    thunder.png \
     tongue.png \
     tv.png \
     uhm-yeah.png \
============================================================
# pidgin/pixmaps/emotes/small/16/thunder.png is binary