pidgin: 843d513c: merge of '06e4830f3567955e026f3d594afcc6...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 843d513c3da12026fc35af070a23a3d11844824c
Ancestor: 06e4830f3567955e026f3d594afcc65a07d57b26
Ancestor: cecd35e48c6dc8f5df7919fd23ecebe9bafb5dc1
Author: rlaager at pidgin.im
Date: 2008-10-30T03:10:33
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/843d513c3da12026fc35af070a23a3d11844824c

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/plugins/log_reader.c
        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 pidgin/gtkconv.c
        pidgin/gtkdialogs.c pidgin/gtkimhtml.c pidgin/gtkprefs.c
        po/de.po

ChangeLog: 

merge of '06e4830f3567955e026f3d594afcc65a07d57b26'
     and 'cecd35e48c6dc8f5df7919fd23ecebe9bafb5dc1'