soc.2008.finch: 7b42fea8: merge of '8bbd9d406b8850d8675c1e339eac7a...

[queueram at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 7b42fea88276f871a4d8446f0bdcde8a8c41e518
Ancestor: 8bbd9d406b8850d8675c1e339eac7aea155936da
Ancestor: 901756ef486a40308f2bf609ed9b9bf7ddd91c91
Author: queueram at soc.pidgin.im
Date: 2008-07-06T21:38:08
Branch: im.pidgin.soc.2008.finch
URL: http://d.pidgin.im/viewmtn/revision/info/7b42fea88276f871a4d8446f0bdcde8a8c41e518

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
        share/ca-certs/CAcert_Class3.pem
        share/ca-certs/CAcert_Root.pem
Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 NEWS configure.ac
        finch/finch.c finch/gntconv.c finch/libgnt/gntbutton.c
        finch/libgnt/gntentry.c finch/libgnt/gntkeys.c
        libpurple/blist.h libpurple/cmds.c libpurple/cmds.h
        libpurple/connection.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/gg/search.h
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/pep.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/myspace/user.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/simple/simple.c
        libpurple/protocols/yahoo/yahoo.c libpurple/prpl.h
        libpurple/purple-url-handler libpurple/roomlist.h
        libpurple/server.c libpurple/sound.h libpurple/util.c
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkimhtml.c
        pidgin/gtkmain.c pidgin/gtkmenutray.c pidgin/gtkutils.c
        pidgin/plugins/cap/cap.c
        pidgin/win32/nsis/pidgin-installer.nsi po/POTFILES.in
        po/de.po po/en_GB.po po/it.po po/nb.po po/te.po po/ur.po
        po/vi.po share/ca-certs/Makefile.am

ChangeLog: 

merge of '8bbd9d406b8850d8675c1e339eac7aea155936da'
     and '901756ef486a40308f2bf609ed9b9bf7ddd91c91'