im.pidgin.pidgin.vv: 6fc5d53de8bd73364b370627020563c614fe6e0a

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 6fc5d53de8bd73364b370627020563c614fe6e0a
Ancestor: c121cde51cc5bd48a26b46df14b86756465ef4a4
Ancestor: ec0f88109090f08d9777f563253782d05cef4624
Author: sadrul at pidgin.im
Date: 2008-02-06T19:11:25
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/6fc5d53de8bd73364b370627020563c614fe6e0a

Modified files:
        finch/plugins/Makefile.am libpurple/example/Makefile.am
        libpurple/media.c libpurple/media.h libpurple/mediamanager.c
        libpurple/mediamanager.h
        libpurple/protocols/bonjour/Makefile.am
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/gg/gg.c libpurple/protocols/irc/irc.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msnp9/Makefile.am
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/qq/qq.c libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo.c libpurple/prpl.h
        pidgin/gtkconv.c pidgin/gtkmedia.c
        pidgin/plugins/musicmessaging/Makefile.am

ChangeLog: 

merge of 'c121cde51cc5bd48a26b46df14b86756465ef4a4'
     and 'ec0f88109090f08d9777f563253782d05cef4624'