cpw.qulogic.msn: 52e1d7af: merge of '0cbcb7f910c95c3dac3f06c404e29d...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 52e1d7af9c625e154c0c5cb4d4c124396e878dd1
Ancestor: 0cbcb7f910c95c3dac3f06c404e29dcc8b709419
Ancestor: d6d2e0024c0c5f5f7b447551d746d165e2b58a8d
Author: qulogic at pidgin.im
Date: 2008-07-12T07:29:56
Branch: im.pidgin.cpw.qulogic.msn
URL: http://d.pidgin.im/viewmtn/revision/info/52e1d7af9c625e154c0c5cb4d4c124396e878dd1

Deleted entries:
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/soap.h
        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
Renamed entries:
        libpurple/protocols/msn/soap2.c to libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/soap2.h to libpurple/protocols/msn/soap.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/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/protocols/irc/msgs.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/msn/Makefile.am
        libpurple/protocols/msn/command.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/group.h
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/msnutils.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/nexus.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c libpurple/protocols/msn/oim.h
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/soap.h
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/sync.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/user.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msnp9/command.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/purple-url-handler libpurple/server.c
        libpurple/util.c libpurple/xmlnode.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
        share/ca-certs/Makefile.am

ChangeLog: 

merge of '0cbcb7f910c95c3dac3f06c404e29dcc8b709419'
     and 'd6d2e0024c0c5f5f7b447551d746d165e2b58a8d'