pidgin.mxit: 6cdd0397: Added 16x16 versions of the new MXit emo...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 6cdd03979cef1dfff4cc1876e0ec8f8d5fc8d6ee
Parent:   09c925f5b6328bd3f703118e4acc61d12a7fb46b
Author:   andrew.victor at mxit.com
Date:     07/28/10 09:52:38
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/6cdd03979cef1dfff4cc1876e0ec8f8d5fc8d6ee

Changelog: 

Added 16x16 versions of the new MXit emoticons - used for Moods.


Changes against parent 09c925f5b6328bd3f703118e4acc61d12a7fb46b

  added    pidgin/pixmaps/emotes/small/16/bored.png
  added    pidgin/pixmaps/emotes/small/16/cold.png
  added    pidgin/pixmaps/emotes/small/16/stressed.png
  patched  pidgin/pixmaps/emotes/small/16/Makefile.am
  attr on  pidgin/pixmaps/emotes/small/16/bored.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/cold.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/stressed.png
      set  mtn:manual_merge
       to  true

-------------- next part --------------
============================================================
--- pidgin/pixmaps/emotes/small/16/Makefile.am	44c35976fa8ea5cc1180dd491fe2bbf7e0225cc9
+++ pidgin/pixmaps/emotes/small/16/Makefile.am	6e7aac936fa3c87c61ee8a2d72efe2a9b9eff642
@@ -25,11 +25,13 @@ SMILEYS = \
     angel.png \
     angry.png \
     beer.png \
+    bored.png \
     camera.png \
     cigarette.png \
     coffee.png \
     confused.png \
     console.png \
+    cold.png \
     cool.png \
     cross.png \
     crying.png \
@@ -40,6 +42,7 @@ SMILEYS = \
     happy.png \
     hug-left.png \
     hug-right.png \
+    hungry.png \
     in_love.png \
     kiss.png \
     meeting.png \
@@ -58,6 +61,7 @@ SMILEYS = \
     silent.png \
     sleeping.png \
     sleepy.png \
+    stressed.png \
     thinking.png \
     tongue.png \
     tv.png \
============================================================
# pidgin/pixmaps/emotes/small/16/bored.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/cold.png is binary
============================================================
# pidgin/pixmaps/emotes/small/16/stressed.png is binary