maiku.vv: 67334e2d: propagate from branch 'im.pidgin.pidgin'...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 67334e2d7df6785a7d2ab3085e73675cfd45b26e
Ancestor: 6b8c653bfd16896dc5b445bb8147d09a37e8db4c
Ancestor: 88691d9566db1f42fa4b1ef880ea02ec3d5f9239
Author: maiku at soc.pidgin.im
Date: 2008-11-07T03:01:55
Branch: im.pidgin.maiku.vv
URL: http://d.pidgin.im/viewmtn/revision/info/67334e2d7df6785a7d2ab3085e73675cfd45b26e

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/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 Doxyfile.in configure.ac 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/wms/Makefile.am finch/libgnt/wms/s.c
        finch/plugins/Makefile.am libpurple/Makefile.am
        libpurple/example/Makefile.am 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/buddy.c
        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/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/qq/Makefile.am
        libpurple/protocols/qq/qq.c
        libpurple/protocols/sametime/Makefile.am
        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/simple/sipmsg.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/gtkconv.c pidgin/gtkconv.h
        pidgin/gtkconvwin.h pidgin/gtkdebug.c pidgin/gtkdialogs.c
        pidgin/gtkimhtml.c pidgin/gtkimhtmltoolbar.c
        pidgin/gtkimhtmltoolbar.h pidgin/gtkprefs.c
        pidgin/gtkprefs.h pidgin/gtkthemes.c 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
Modified attrs:
        pidgin/pixmaps/toolbar/16/audio-call.png
        pidgin/pixmaps/toolbar/16/video-call.png

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 6b8c653bfd16896dc5b445bb8147d09a37e8db4c)
            to branch 'im.pidgin.maiku.vv' (head 88691d9566db1f42fa4b1ef880ea02ec3d5f9239)