pidgin.vv: 5046b440: propagate from branch 'im.pidgin.pidgin'...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 5046b4407171faabb0ed473025cdb4549e76d8fd
Ancestor: a423c1d70ce3825dacb1a625bb4f5c713936e268
Ancestor: e028e1fa5d4d70792f0219311b12e5f4b1587776
Author: maiku at soc.pidgin.im
Date: 2009-04-03T07:10:07
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/5046b4407171faabb0ed473025cdb4549e76d8fd

Added files:
        finch/gntmedia.c finch/gntmedia.h libpurple/marshallers.list
        libpurple/media-gst.h libpurple/media.c libpurple/media.h
        libpurple/mediamanager.c libpurple/mediamanager.h
        libpurple/protocols/jabber/jingle/content.c
        libpurple/protocols/jabber/jingle/content.h
        libpurple/protocols/jabber/jingle/iceudp.c
        libpurple/protocols/jabber/jingle/iceudp.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jingle/rawudp.c
        libpurple/protocols/jabber/jingle/rawudp.h
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/jingle/rtp.h
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/jingle/session.h
        libpurple/protocols/jabber/jingle/transport.c
        libpurple/protocols/jabber/jingle/transport.h
        pidgin/gtkmedia.c pidgin/gtkmedia.h
        pidgin/pixmaps/toolbar/16/audio-call.png
        pidgin/pixmaps/toolbar/16/video-call.png
Added directories:
        libpurple/protocols/jabber/jingle
Modified files:
        ChangeLog.API configure.ac finch/Makefile.am finch/gntui.c
        finch/libgnt/gntkeys.h libpurple/Makefile.am
        libpurple/internal.h libpurple/network.c libpurple/network.h
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/gg/gg.c libpurple/protocols/irc/irc.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/msn.c
        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/sametime/sametime.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/zephyr/zephyr.c libpurple/prpl.c
        libpurple/prpl.h libpurple/xmlnode.c libpurple/xmlnode.h
        pidgin/Makefile.am pidgin/Makefile.mingw pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkconvwin.h pidgin/gtkdialogs.c
        pidgin/gtkimhtmltoolbar.h pidgin/gtkmain.c pidgin/gtkprefs.c
        pidgin/gtkprefs.h pidgin/pidginstock.c pidgin/pidginstock.h
        pidgin/pixmaps/Makefile.am po/POTFILES.in
Modified attrs:
        pidgin/pixmaps/toolbar/16/audio-call.png
        pidgin/pixmaps/toolbar/16/video-call.png

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head e028e1fa5d4d70792f0219311b12e5f4b1587776)
            to branch 'im.pidgin.pidgin.vv' (head a423c1d70ce3825dacb1a625bb4f5c713936e268)