Revision a829932fdb9eb4444f4313a33788ecb266696af1

[nwalp at pidgin.im]

-----------------------------------------------------------------
Revision: a829932fdb9eb4444f4313a33788ecb266696af1
Ancestor: 12d65ba57d0e91f1bd68b923a95faab92a2bebe1
Ancestor: b0753c11df84cce7262621801d1d625cb3366495
Author: nwalp at pidgin.im
Date: 2007-06-25T02:57:15
Branch: im.pidgin.pidgin

Modified files:
        finch/gntplugin.c libpurple/protocols/bonjour/buddy.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/mdns_common.c
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/qq/Makefile.mingw
        libpurple/win32/win32dep.c

ChangeLog: 

merge of '12d65ba57d0e91f1bd68b923a95faab92a2bebe1'
     and 'b0753c11df84cce7262621801d1d625cb3366495'


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