pidgin: 30e46717: merge of '30922c7a0ed0323c9c88a1a70e4677...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 30e46717076dacdd40dc7031f1cd2bf32e19de70
Ancestor: 30922c7a0ed0323c9c88a1a70e4677aaab277a2f
Ancestor: bcde7f40d968bb56f9821dd3522211344b5342d4
Author: rekkanoryo at pidgin.im
Date: 2008-10-29T04:37:14
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/30e46717076dacdd40dc7031f1cd2bf32e19de70

Deleted entries:
        libpurple/protocols/qq/group_conv.c
        libpurple/protocols/qq/group_conv.h
        libpurple/protocols/qq/group_find.c
        libpurple/protocols/qq/group_find.h
        libpurple/protocols/qq/group_free.c
        libpurple/protocols/qq/group_free.h
        libpurple/protocols/qq/group_search.c
        libpurple/protocols/qq/group_search.h
        libpurple/protocols/qq/sys_msg.c
        libpurple/protocols/qq/sys_msg.h
Renamed entries:
        libpurple/protocols/qq/header_info.c to libpurple/protocols/qq/qq_define.c
        libpurple/protocols/qq/header_info.h to libpurple/protocols/qq/qq_define.h
Modified files:
        libpurple/protocols/qq/AUTHORS
        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_list.h
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/buddy_opt.h
        libpurple/protocols/qq/char_conv.c
        libpurple/protocols/qq/char_conv.h
        libpurple/protocols/qq/file_trans.c
        libpurple/protocols/qq/group.c
        libpurple/protocols/qq/group.h
        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_internal.c
        libpurple/protocols/qq/group_internal.h
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/group_join.h
        libpurple/protocols/qq/group_opt.c
        libpurple/protocols/qq/group_opt.h
        libpurple/protocols/qq/im.c libpurple/protocols/qq/im.h
        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/qq_base.c
        libpurple/protocols/qq/qq_base.h
        libpurple/protocols/qq/qq_define.c
        libpurple/protocols/qq/qq_define.h
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_network.h
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/qq_process.h
        libpurple/protocols/qq/qq_trans.c
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/qq/utils.h po/de.po

ChangeLog: 

merge of '30922c7a0ed0323c9c88a1a70e4677aaab277a2f'
     and 'bcde7f40d968bb56f9821dd3522211344b5342d4'