pidgin.mxit: dff0a929: Add new MXit emoticons.

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: dff0a9294df6250976f90685b3229fb816d3f8c5
Parent:   f90e75463e6b71a4c443669769bc0f58d189ac99
Author:   andrew.victor at mxit.com
Date:     07/28/10 08:21:28
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/dff0a9294df6250976f90685b3229fb816d3f8c5

Changelog: 

Add new MXit emoticons.


Changes against parent f90e75463e6b71a4c443669769bc0f58d189ac99

  added    pidgin/pixmaps/emotes/default/24/bored.png
  added    pidgin/pixmaps/emotes/default/24/cold.png
  added    pidgin/pixmaps/emotes/default/24/stressed.png
  patched  pidgin/pixmaps/emotes/default/24/Makefile.am
  patched  pidgin/pixmaps/emotes/default/24/default.theme.in
  attr on  pidgin/pixmaps/emotes/default/24/bored.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/default/24/cold.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/default/24/stressed.png
      set  mtn:manual_merge
       to  true

-------------- next part --------------
============================================================
--- pidgin/pixmaps/emotes/default/24/Makefile.am	e3dee1e6cb5ad609c71305414231d594c220d808
+++ pidgin/pixmaps/emotes/default/24/Makefile.am	ef630cba99a8f2f5fd3dc21e18e98f612b12ce75
@@ -14,6 +14,7 @@ SMILEYS = \
     beer.png \
     blowkiss.png \
     bomb.png \
+    bored.png \
     bowl.png \
     boy.png \
     brb.png \
@@ -36,6 +37,7 @@ SMILEYS = \
     clown.png \
     coffee.png \
     coins.png \
+    cold.png \
     computer.png \
     confused.png \
     console.png \
@@ -168,6 +170,7 @@ SMILEYS = \
     star.png \
     starving.png \
     stop.png \
+    stressed.png \
     struggle.png \
     sun.png \
     hot.png \
============================================================
--- pidgin/pixmaps/emotes/default/24/default.theme.in	882e802df637b0fc04f23f7cb09f8949013a5ae9
+++ pidgin/pixmaps/emotes/default/24/default.theme.in	a71e1b197af41c3c494e22c501ace6befa62ea3e
@@ -489,3 +489,9 @@ pirate.png          P-)
 lying.png           :L)
 glasses-nerdy.png   8-|     8|
 pirate.png          P-)
+### Added in v5.9.7
+bored.png           :-[     :[
+cold.png            :-<     :<
+confused.png        :-,     :,
+hungry.png          :-C     :C
+stressed.png        :-s     :s
============================================================
# pidgin/pixmaps/emotes/default/24/bored.png is binary
============================================================
# pidgin/pixmaps/emotes/default/24/cold.png is binary
============================================================
# pidgin/pixmaps/emotes/default/24/stressed.png is binary