pidgin.2.4.3: 53616f71: merge of '78bf389fcde2b7031fecab2f75daef...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 53616f7134143519825539eb293f1fa1f358c2a0
Ancestor: 78bf389fcde2b7031fecab2f75daefd749395421
Ancestor: a6a8a0f2b45006944916446be22cb8e56f0fca3f
Author: nosnilmot at pidgin.im
Date: 2008-06-26T01:17:25
Branch: im.pidgin.pidgin.2.4.3
URL: http://d.pidgin.im/viewmtn/revision/info/53616f7134143519825539eb293f1fa1f358c2a0

Deleted entries:
        libpurple/protocols/qq/qq_proxy.c
        libpurple/protocols/qq/qq_proxy.h
        libpurple/protocols/qq/recv_core.c
        libpurple/protocols/qq/recv_core.h
        libpurple/protocols/qq/send_core.c
        libpurple/protocols/qq/send_core.h
        libpurple/protocols/qq/sendqueue.c
        libpurple/protocols/qq/sendqueue.h
        libpurple/protocols/qq/udp_proxy_s5.c
        libpurple/protocols/qq/udp_proxy_s5.h
Added files:
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_network.h
        libpurple/protocols/qq/qq_trans.c
        libpurple/protocols/qq/qq_trans.h
Modified files:
        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_status.c
        libpurple/protocols/qq/buddy_status.h
        libpurple/protocols/qq/char_conv.c
        libpurple/protocols/qq/crypt.c
        libpurple/protocols/qq/crypt.h
        libpurple/protocols/qq/file_trans.c
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/group_im.h
        libpurple/protocols/qq/group_info.c
        libpurple/protocols/qq/group_info.h
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/group_join.h
        libpurple/protocols/qq/group_network.c
        libpurple/protocols/qq/group_opt.c
        libpurple/protocols/qq/group_opt.h
        libpurple/protocols/qq/group_search.c
        libpurple/protocols/qq/group_search.h
        libpurple/protocols/qq/im.c
        libpurple/protocols/qq/keep_alive.c
        libpurple/protocols/qq/login_logout.c
        libpurple/protocols/qq/packet_parse.c
        libpurple/protocols/qq/packet_parse.h
        libpurple/protocols/qq/qq.c libpurple/protocols/qq/qq.h
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/qq/send_file.h
        libpurple/protocols/qq/sys_msg.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/qq/utils.h
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

merge of '78bf389fcde2b7031fecab2f75daefd749395421'
     and 'a6a8a0f2b45006944916446be22cb8e56f0fca3f'