cpw.darkrain42.xmpp.disco: 1aacbfeb: propagate from branch 'im.pidgin.pidgin'...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: 1aacbfeb9dc60ee618580414704ebccfa7854ace
Ancestor: 0068cedd03804855a4ded8aeb153ccaffb8158bc
Ancestor: 7a48183ef659df8a9f45f8e6187fbb2abac019d1
Author: paul at darkrain42.org
Date: 2009-04-11T18:20:52
Branch: im.pidgin.cpw.darkrain42.xmpp.disco
URL: http://d.pidgin.im/viewmtn/revision/info/1aacbfeb9dc60ee618580414704ebccfa7854ace

Added files:
        libpurple/disco.c libpurple/disco.h pidgin/gtkdisco.c
        pidgin/gtkdisco.h
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API configure.ac
        finch/gntconv.c finch/gntmedia.c libpurple/Makefile.am
        libpurple/Makefile.mingw libpurple/account.c
        libpurple/blist.c libpurple/blist.h libpurple/buddyicon.c
        libpurple/conversation.c libpurple/conversation.h
        libpurple/core.c libpurple/media.c libpurple/media.h
        libpurple/mediamanager.c libpurple/mediamanager.h
        libpurple/plugin.c libpurple/plugin.h
        libpurple/plugins/filectl.c libpurple/plugins/joinpart.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/disco.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/msnp9/httpconn.c
        libpurple/protocols/msnp9/slp.c
        libpurple/protocols/msnp9/slpcall.c
        libpurple/protocols/msnp9/slpcall.h
        libpurple/protocols/msnp9/transaction.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/zephyr/zephyr.c libpurple/prpl.c
        libpurple/prpl.h libpurple/purple.h.in
        libpurple/win32/win32dep.c pidgin/Makefile.am
        pidgin/Makefile.mingw pidgin/gtkblist.c pidgin/gtkconv.c
        pidgin/gtkdebug.c pidgin/gtkmain.c pidgin/gtkmedia.c
        pidgin/gtkplugin.c pidgin/gtksound.c pidgin/gtkstatusbox.c
        pidgin/gtkutils.c pidgin/pidginstock.c
        pidgin/plugins/cap/cap.c pidgin/plugins/mailchk.c
        pidgin/plugins/musicmessaging/musicmessaging.c

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 0068cedd03804855a4ded8aeb153ccaffb8158bc)
            to branch 'org.darkrain42.pidgin.disco' (head 7a48183ef659df8a9f45f8e6187fbb2abac019d1)