pidgin.vv: 7236bce2: propagate from branch 'im.pidgin.pidgin'...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 7236bce25ddbed15564de5af9337c965588f12c4
Ancestor: 8e99bf9be800f9578d7e94cc4d522d435cfc80dd
Ancestor: e96b8392652eff68af61abf72fa6667c0564e2ab
Author: maiku at soc.pidgin.im
Date: 2009-01-07T03:07:01
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/7236bce25ddbed15564de5af9337c965588f12c4

Added files:
        finch/gntmedia.c finch/gntmedia.h libpurple/marshallers.list
        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:
        COPYRIGHT ChangeLog.API Doxyfile.in configure.ac
        doc/Makefile.am finch/Makefile.am finch/gntaccount.c
        finch/gntdebug.c finch/gntft.c finch/gntnotify.c
        finch/gntplugin.c finch/gntpounce.c finch/gntrequest.c
        finch/gntstatus.c finch/gntui.c finch/libgnt/Makefile.am
        finch/libgnt/gntkeys.h finch/libgnt/gntmain.c
        finch/libgnt/gnttree.c finch/libgnt/gntwindow.c
        finch/libgnt/gntwm.c finch/libgnt/wms/Makefile.am
        finch/libgnt/wms/irssi.c finch/libgnt/wms/s.c
        finch/plugins/Makefile.am libpurple/Makefile.am
        libpurple/dbus-server.c libpurple/dnsquery.c
        libpurple/example/Makefile.am libpurple/ft.c
        libpurple/plugin.c libpurple/plugins/Makefile.am
        libpurple/plugins/perl/Makefile.am
        libpurple/plugins/ssl/Makefile.am
        libpurple/plugins/tcl/Makefile.am
        libpurple/protocols/bonjour/Makefile.am
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/gg/Makefile.am
        libpurple/protocols/gg/gg.c
        libpurple/protocols/irc/Makefile.am
        libpurple/protocols/irc/irc.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/caps.c
        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/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/msn/Makefile.am
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msnp9/Makefile.am
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/myspace/Makefile.am
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/novell/Makefile.am
        libpurple/protocols/novell/novell.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/Makefile.am
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/qq/im.c libpurple/protocols/qq/qq.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/sametime/Makefile.am
        libpurple/protocols/sametime/Makefile.mingw
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc/Makefile.am
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/simple/Makefile.am
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/Makefile.am
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/zephyr/Makefile.am
        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/gtkconv.h pidgin/gtkconvwin.h
        pidgin/gtkdebug.c pidgin/gtkdialogs.c
        pidgin/gtkimhtmltoolbar.c pidgin/gtkimhtmltoolbar.h
        pidgin/gtkprefs.c pidgin/gtkprefs.h pidgin/pidginstock.c
        pidgin/pidginstock.h pidgin/pixmaps/Makefile.am
        pidgin/plugins/Makefile.am pidgin/plugins/cap/Makefile.am
        pidgin/plugins/gestures/Makefile.am
        pidgin/plugins/gevolution/Makefile.am
        pidgin/plugins/musicmessaging/Makefile.am
        pidgin/plugins/ticker/Makefile.am po/POTFILES.in po/bn.po
        po/ca.po po/ca at valencia.po po/de.po po/fr.po po/hu.po
Modified attrs:
        pidgin/pixmaps/toolbar/16/audio-call.png
        pidgin/pixmaps/toolbar/16/video-call.png

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 8e99bf9be800f9578d7e94cc4d522d435cfc80dd)
            to branch 'im.pidgin.pidgin.vv' (head e96b8392652eff68af61abf72fa6667c0564e2ab)