pidgin.mxit: 09c925f5: propagate from branch 'im.pidgin.pidgin'...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 09c925f5b6328bd3f703118e4acc61d12a7fb46b
Parent:   9d595f880c678cec5d1337783f6c0c2b0ac53677
Parent:   dff0a9294df6250976f90685b3229fb816d3f8c5
Author:   andrew.victor at mxit.com
Date:     07/28/10 08:51:44
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/09c925f5b6328bd3f703118e4acc61d12a7fb46b

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head 9d595f880c678cec5d1337783f6c0c2b0ac53677)
            to branch 'im.pidgin.pidgin.mxit' (head dff0a9294df6250976f90685b3229fb816d3f8c5)

Changes against parent 9d595f880c678cec5d1337783f6c0c2b0ac53677

  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  libpurple/protocols/mxit/actions.c
  patched  libpurple/protocols/mxit/markup.c
  patched  libpurple/protocols/mxit/roster.c
  patched  libpurple/protocols/mxit/roster.h
  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

Changes against parent dff0a9294df6250976f90685b3229fb816d3f8c5

  patched  COPYRIGHT
  patched  libpurple/protocols/mxit/profile.c
  patched  libpurple/protocols/mxit/profile.h
  patched  pidgin/gtkdialogs.c
  patched  po/ChangeLog
  patched  po/af.po
  patched  po/am.po
  patched  po/ar.po
  patched  po/as.po
  patched  po/az.po
  patched  po/be at latin.po
  patched  po/bg.po
  patched  po/bn.po
  patched  po/bn_IN.po
  patched  po/bs.po
  patched  po/ca.po
  patched  po/ca at valencia.po
  patched  po/cs.po
  patched  po/da.po
  patched  po/de.po
  patched  po/dz.po
  patched  po/el.po
  patched  po/en_AU.po
  patched  po/en_CA.po
  patched  po/en_GB.po
  patched  po/eo.po
  patched  po/es.po
  patched  po/et.po
  patched  po/eu.po
  patched  po/fa.po
  patched  po/fi.po
  patched  po/fr.po
  patched  po/ga.po
  patched  po/gl.po
  patched  po/gu.po
  patched  po/he.po
  patched  po/hi.po
  patched  po/hu.po
  patched  po/hy.po
  patched  po/id.po
  patched  po/it.po
  patched  po/ja.po
  patched  po/ka.po
  patched  po/km.po
  patched  po/kn.po
  patched  po/ko.po
  patched  po/ku.po
  patched  po/lo.po
  patched  po/lt.po
  patched  po/mk.po
  patched  po/ml.po
  patched  po/mn.po
  patched  po/mr.po
  patched  po/ms_MY.po
  patched  po/my_MM.po
  patched  po/nb.po
  patched  po/ne.po
  patched  po/nl.po
  patched  po/nn.po
  patched  po/oc.po
  patched  po/or.po
  patched  po/pa.po
  patched  po/pl.po
  patched  po/ps.po
  patched  po/pt.po
  patched  po/pt_BR.po
  patched  po/ro.po
  patched  po/ru.po
  patched  po/si.po
  patched  po/sk.po
  patched  po/sl.po
  patched  po/sq.po
  patched  po/sr.po
  patched  po/sr at latin.po
  patched  po/sv.po
  patched  po/sw.po
  patched  po/ta.po
  patched  po/te.po
  patched  po/th.po
  patched  po/tr.po
  patched  po/uk.po
  patched  po/ur.po
  patched  po/vi.po
  patched  po/xh.po
  patched  po/zh_CN.po
  patched  po/zh_HK.po
  patched  po/zh_TW.po