pidgin: 372a5b35: merge of '3d0b19df4a52ab42b61494afac9c85...

[resiak at pidgin.im]

-----------------------------------------------------------------
Revision: 372a5b358b4d8f8552f5696bf1260c9191734c8b
Ancestor: 3d0b19df4a52ab42b61494afac9c85d170398fa8
Ancestor: 9017d2519c3dbbb02402b0785a4750aab2e18a56
Author: resiak at pidgin.im
Date: 2008-07-03T14:51:52
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/372a5b358b4d8f8552f5696bf1260c9191734c8b

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:
        doc/cmd-signals.dox 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:
        ChangeLog ChangeLog.API ChangeLog.win32 NEWS configure.ac
        finch/finch.c finch/gntconv.c finch/libgnt/gntbutton.c
        finch/libgnt/gntkeys.c libpurple/cmds.c libpurple/cmds.h
        libpurple/conversation.c libpurple/conversation.h
        libpurple/core.c libpurple/core.h libpurple/idle.c
        libpurple/internal.h libpurple/log.c libpurple/nat-pmp.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/qq/AUTHORS
        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_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_internal.c
        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
        libpurple/protocols/silc/buddy.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/buddy.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/yahoo/yahoo.c libpurple/server.c
        libpurple/util.c pidgin/gtkblist.c pidgin/gtkimhtml.c
        pidgin/gtkmain.c pidgin/gtkmenutray.c
        pidgin/win32/nsis/pidgin-installer.nsi po/POTFILES.in
        po/de.po po/it.po po/nb.po po/te.po po/ur.po po/vi.po

ChangeLog: 

merge of '3d0b19df4a52ab42b61494afac9c85d170398fa8'
     and '9017d2519c3dbbb02402b0785a4750aab2e18a56'