Revision 22f61fc26124c43dc25f08225ffd6e43eab159db

[nwalp at pidgin.im]

-----------------------------------------------------------------
Revision: 22f61fc26124c43dc25f08225ffd6e43eab159db
Ancestor: a044da71f197bdd564f0d38ebb02798e06d1997f
Ancestor: e64c6a26887b59ce7ad568ea1c551938e673c7a0
Author: nwalp at pidgin.im
Date: 2007-06-17T05:09:21
Branch: im.pidgin.pidgin

Added files:
        finch/plugins/pietray.py
Modified files:
        ChangeLog.API finch/gntft.c finch/gntpounce.c
        finch/plugins/Makefile.am libpurple/blist.c libpurple/core.c
        libpurple/dbus-analyze-functions.py libpurple/dbus-server.c
        libpurple/internal.h libpurple/plugins/startup.py
        libpurple/pounce.c libpurple/pounce.h
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/login_logout.c
        libpurple/protocols/qq/packet_parse.c
        libpurple/protocols/qq/packet_parse.h
        libpurple/protocols/yahoo/yahoo_doodle.c
        libpurple/protocols/zephyr/ZLocations.c libpurple/util.c
        pidgin/gtkft.c pidgin/gtkmain.c pidgin/gtkpounce.c
        pidgin/gtkutils.c
Modified attrs:
        finch/plugins/pietray.py

ChangeLog: 

merge of 'a044da71f197bdd564f0d38ebb02798e06d1997f'
     and 'e64c6a26887b59ce7ad568ea1c551938e673c7a0'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 22f61fc26124c43dc25f08225ffd6e43eab159db