pidgin: af26f1bd: merge of '1cb5c4ca943e9f7ecd09da32a34b56...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: af26f1bd7152431eb3dc9e2c6a5a505c6bc1f960
Parent:   1cb5c4ca943e9f7ecd09da32a34b562f4e52269d
Parent:   e0d1d5b89727744181eddd937fe7d3ee1dc0603e
Author:   malu at pidgin.im
Date:     08/29/10 14:41:26
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/af26f1bd7152431eb3dc9e2c6a5a505c6bc1f960

Changelog: 

merge of '1cb5c4ca943e9f7ecd09da32a34b562f4e52269d'
     and 'e0d1d5b89727744181eddd937fe7d3ee1dc0603e'

Changes against parent 1cb5c4ca943e9f7ecd09da32a34b562f4e52269d

  patched  ChangeLog
  patched  libpurple/request.c

Changes against parent e0d1d5b89727744181eddd937fe7d3ee1dc0603e

  dropped  pidgin/pixmaps/emotes/small/16/cool.png
  dropped  pidgin/pixmaps/emotes/small/16/grin.png
  added    pidgin/pixmaps/emotes/small/16/glasses-cool.png
  added    pidgin/pixmaps/emotes/small/16/thunder.png
  patched  ChangeLog
  patched  finch/gntaccount.c
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/jabber.h
  patched  libpurple/protocols/jabber/parser.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/pixmaps/emotes/default/24/default.theme.in
  patched  pidgin/pixmaps/emotes/small/16/Makefile.am
  patched  pidgin/pixmaps/emotes/small/16/small.theme.in
  patched  pidgin/plugins/gevolution/add_buddy_dialog.c
  patched  pidgin/plugins/gevolution/new_person_dialog.c
  attr on  pidgin/pixmaps/emotes/small/16/glasses-cool.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/thunder.png
      set  mtn:manual_merge
       to  true