pidgin.openq: 498cca9c: merge of '8c50cfe68a5cab6521acc54fedd679...

[csyfek at gmail.com]

-----------------------------------------------------------------
Revision: 498cca9ce0a8f8a2c2538374ad9c402f7926423c
Ancestor: 8c50cfe68a5cab6521acc54fedd6797e6c8b863f
Ancestor: b5edbb5c5168486c2c8c4b6bd01af85cbe56dc3c
Author: csyfek at gmail.com
Date: 2008-09-19T14:48:00
Branch: im.pidgin.pidgin.openq
URL: http://d.pidgin.im/viewmtn/revision/info/498cca9ce0a8f8a2c2538374ad9c402f7926423c

Deleted entries:
        libpurple/protocols/qq/sys_msg.c
        libpurple/protocols/qq/sys_msg.h
Modified files:
        ChangeLog libpurple/dnsquery.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/qq/Makefile.mingw
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_info.h
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/buddy_opt.h
        libpurple/protocols/qq/group.c
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/group_join.h
        libpurple/protocols/qq/group_opt.c
        libpurple/protocols/qq/header_info.c
        libpurple/protocols/qq/header_info.h
        libpurple/protocols/qq/im.c
        libpurple/protocols/qq/packet_parse.c
        libpurple/protocols/qq/qq.c libpurple/protocols/qq/qq.h
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/qq_process.h
        libpurple/protocols/qq/qq_trans.c libpurple/proxy.c
        pidgin/gtkimhtml.c pidgin/gtkmenutray.c
        pidgin/plugins/pidginrc.c

ChangeLog: 

merge of '8c50cfe68a5cab6521acc54fedd6797e6c8b863f'
     and 'b5edbb5c5168486c2c8c4b6bd01af85cbe56dc3c'