cpw.malu.xmpp.jingle_ft: 3ea52801: merge of '0399381a66b62ef8e8b543a0ddeb15...
malu at pidgin.im
malu at pidgin.im
Tue Oct 4 16:51:22 EDT 2011
----------------------------------------------------------------------
Revision: 3ea52801c51290bb6ca81c3196846173849abe55
Parent: 0399381a66b62ef8e8b543a0ddeb155f4a11ece4
Parent: d4b4e9e27413e440c6b017ab62b923de305d3aa2
Author: malu at pidgin.im
Date: 10/04/11 16:48:01
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/3ea52801c51290bb6ca81c3196846173849abe55
Changelog:
merge of '0399381a66b62ef8e8b543a0ddeb155f4a11ece4'
and 'd4b4e9e27413e440c6b017ab62b923de305d3aa2'
Changes against parent 0399381a66b62ef8e8b543a0ddeb155f4a11ece4
dropped gaim-uninstalled.pc.in
dropped gaim.pc.in
dropped libpurple/gaim-compat.h
dropped libpurple/protocols/silc10
dropped libpurple/protocols/silc10/Makefile.am
dropped libpurple/protocols/silc10/Makefile.mingw
dropped libpurple/protocols/silc10/README
dropped libpurple/protocols/silc10/TODO
dropped libpurple/protocols/silc10/buddy.c
dropped libpurple/protocols/silc10/chat.c
dropped libpurple/protocols/silc10/ft.c
dropped libpurple/protocols/silc10/ops.c
dropped libpurple/protocols/silc10/pk.c
dropped libpurple/protocols/silc10/silc.c
dropped libpurple/protocols/silc10/silcpurple.h
dropped libpurple/protocols/silc10/util.c
dropped libpurple/protocols/silc10/wb.c
dropped libpurple/protocols/silc10/wb.h
dropped libpurple/purple-uninstalled.pc.in
dropped libpurple/purple.pc.in
dropped pidgin/gtkdocklet-gtk.c
dropped pidgin/gtkgaim-compat.h
dropped pidgin/pidgin-uninstalled.pc.in
dropped pidgin/pidgin.pc.in
renamed libpurple/purple-2-uninstalled.pc.in
to libpurple/purple-3-uninstalled.pc.in
renamed libpurple/purple-2.pc.in
to libpurple/purple-3.pc.in
renamed pidgin/pidgin-2-uninstalled.pc.in
to pidgin/pidgin-3-uninstalled.pc.in
renamed pidgin/pidgin-2.pc.in
to pidgin/pidgin-3.pc.in
added .tx
added pidgin/plugins/adiumthemes
added .tx/config
added libpurple/protocols/gg/lib/deflate.c
added libpurple/protocols/gg/lib/deflate.h
added libpurple/tests/test_xmlnode.c
added pidgin/gtkconv-theme-loader.c
added pidgin/gtkconv-theme-loader.h
added pidgin/gtkconv-theme.c
added pidgin/gtkconv-theme.h
added pidgin/gtkwebview.c
added pidgin/gtkwebview.h
added pidgin/plugins/adiumthemes/Makefile.am
added pidgin/plugins/adiumthemes/Template.html
added pidgin/plugins/adiumthemes/message-style.c
added pidgin/plugins/adiumthemes/message-style.h
added pidgin/plugins/adiumthemes/webkit.c
added pidgin/plugins/webkit.c
added pidgin/smileyparser.c
added pidgin/smileyparser.h
patched .mtn-ignore
patched AUTHORS
patched COPYRIGHT
patched ChangeLog
patched ChangeLog.API
patched Makefile.am
patched NEWS
patched configure.ac
patched doc/account-signals.dox
patched doc/blist-signals.dox
patched doc/connection-signals.dox
patched doc/conversation-signals.dox
patched doc/gtkconv-signals.dox
patched doc/notify-signals.dox
patched finch/finch.c
patched finch/gntaccount.h
patched finch/gntblist.c
patched finch/gntblist.h
patched finch/gntconn.c
patched finch/gntconv.c
patched finch/gntconv.h
patched finch/gntft.c
patched finch/gntnotify.c
patched finch/gntprefs.c
patched finch/gntrequest.c
patched finch/gntrequest.h
patched finch/gntroomlist.c
patched finch/gntsound.c
patched finch/gntsound.h
patched finch/libgnt/gntfilesel.h
patched finch/libgnt/gntprogressbar.h
patched finch/libgnt/gnttree.h
patched finch/libgnt/gntwidget.h
patched finch/libgnt/gntwm.c
patched finch/libgnt/gntwm.h
patched finch/plugins/gntgf.c
patched finch/plugins/gnttinyurl.c
patched finch/plugins/lastlog.c
patched libpurple/Makefile.am
patched libpurple/account.c
patched libpurple/account.h
patched libpurple/accountopt.c
patched libpurple/accountopt.h
patched libpurple/blist.c
patched libpurple/blist.h
patched libpurple/buddyicon.c
patched libpurple/buddyicon.h
patched libpurple/certificate.c
patched libpurple/certificate.h
patched libpurple/cipher.h
patched libpurple/cmds.h
patched libpurple/connection.c
patched libpurple/connection.h
patched libpurple/conversation.c
patched libpurple/conversation.h
patched libpurple/core.c
patched libpurple/core.h
patched libpurple/dbus-analyze-functions.py
patched libpurple/dbus-server.c
patched libpurple/dbus-server.h
patched libpurple/dbus-useful.c
patched libpurple/debug.c
patched libpurple/debug.h
patched libpurple/dnsquery.c
patched libpurple/dnsquery.h
patched libpurple/dnssrv.c
patched libpurple/dnssrv.h
patched libpurple/eventloop.h
patched libpurple/example/nullclient.c
patched libpurple/ft.c
patched libpurple/ft.h
patched libpurple/imgstore.h
patched libpurple/internal.h
patched libpurple/log.c
patched libpurple/log.h
patched libpurple/media/backend-fs2.c
patched libpurple/media/backend-fs2.h
patched libpurple/media/backend-iface.h
patched libpurple/media/candidate.h
patched libpurple/media/codec.h
patched libpurple/media/enum-types.h
patched libpurple/media-gst.h
patched libpurple/media.h
patched libpurple/mediamanager.h
patched libpurple/nat-pmp.c
patched libpurple/network.c
patched libpurple/network.h
patched libpurple/notify.c
patched libpurple/notify.h
patched libpurple/ntlm.c
patched libpurple/plugin.c
patched libpurple/plugin.h
patched libpurple/plugins/filectl.c
patched libpurple/plugins/log_reader.c
patched libpurple/plugins/perl/common/Account.xs
patched libpurple/plugins/perl/common/BuddyList.xs
patched libpurple/plugins/perl/common/Certificate.xs
patched libpurple/plugins/perl/common/Connection.xs
patched libpurple/plugins/perl/common/Conversation.xs
patched libpurple/plugins/perl/common/FT.xs
patched libpurple/plugins/perl/common/Network.xs
patched libpurple/plugins/perl/common/Notify.xs
patched libpurple/plugins/perl/common/Request.xs
patched libpurple/plugins/perl/common/SSLConn.xs
patched libpurple/plugins/perl/common/Status.xs
patched libpurple/plugins/perl/common/Util.xs
patched libpurple/plugins/statenotify.c
patched libpurple/plugins/tcl/tcl_cmds.c
patched libpurple/plugins/tcl/tcl_ref.c
patched libpurple/plugins/tcl/tcl_signals.c
patched libpurple/pounce.c
patched libpurple/pounce.h
patched libpurple/prefs.c
patched libpurple/prefs.h
patched libpurple/privacy.c
patched libpurple/privacy.h
patched libpurple/protocols/Makefile.am
patched libpurple/protocols/bonjour/bonjour.c
patched libpurple/protocols/bonjour/bonjour_ft.c
patched libpurple/protocols/bonjour/jabber.c
patched libpurple/protocols/bonjour/mdns_avahi.c
patched libpurple/protocols/bonjour/mdns_common.c
patched libpurple/protocols/bonjour/mdns_types.h
patched libpurple/protocols/bonjour/mdns_win32.c
patched libpurple/protocols/gg/Makefile.am
patched libpurple/protocols/gg/Makefile.mingw
patched libpurple/protocols/gg/buddylist.c
patched libpurple/protocols/gg/confer.c
patched libpurple/protocols/gg/gg.c
patched libpurple/protocols/gg/lib/common.c
patched libpurple/protocols/gg/lib/dcc.c
patched libpurple/protocols/gg/lib/dcc7.c
patched libpurple/protocols/gg/lib/debug.c
patched libpurple/protocols/gg/lib/encoding.c
patched libpurple/protocols/gg/lib/events.c
patched libpurple/protocols/gg/lib/handlers.c
patched libpurple/protocols/gg/lib/http.c
patched libpurple/protocols/gg/lib/libgadu-config.h
patched libpurple/protocols/gg/lib/libgadu-debug.h
patched libpurple/protocols/gg/lib/libgadu.c
patched libpurple/protocols/gg/lib/libgadu.h
patched libpurple/protocols/gg/lib/obsolete.c
patched libpurple/protocols/gg/lib/protocol.h
patched libpurple/protocols/gg/lib/pubdir.c
patched libpurple/protocols/gg/lib/pubdir50.c
patched libpurple/protocols/gg/lib/resolver.c
patched libpurple/protocols/gg/lib/sha1.c
patched libpurple/protocols/gg/search.c
patched libpurple/protocols/gg/search.h
patched libpurple/protocols/irc/dcc_send.c
patched libpurple/protocols/irc/irc.c
patched libpurple/protocols/irc/irc.h
patched libpurple/protocols/irc/msgs.c
patched libpurple/protocols/irc/parse.c
patched libpurple/protocols/jabber/adhoccommands.c
patched libpurple/protocols/jabber/auth.c
patched libpurple/protocols/jabber/auth_cyrus.c
patched libpurple/protocols/jabber/auth_plain.c
patched libpurple/protocols/jabber/bosh.c
patched libpurple/protocols/jabber/buddy.c
patched libpurple/protocols/jabber/caps.c
patched libpurple/protocols/jabber/chat.c
patched libpurple/protocols/jabber/disco.c
patched libpurple/protocols/jabber/google/jingleinfo.c
patched libpurple/protocols/jabber/google/relay.c
patched libpurple/protocols/jabber/jabber.c
patched libpurple/protocols/jabber/jutil.c
patched libpurple/protocols/jabber/libxmpp.c
patched libpurple/protocols/jabber/message.c
patched libpurple/protocols/jabber/oob.c
patched libpurple/protocols/jabber/parser.c
patched libpurple/protocols/jabber/presence.c
patched libpurple/protocols/jabber/presence.h
patched libpurple/protocols/jabber/roster.c
patched libpurple/protocols/jabber/roster.h
patched libpurple/protocols/jabber/si.c
patched libpurple/protocols/jabber/useravatar.c
patched libpurple/protocols/jabber/usermood.c
patched libpurple/protocols/jabber/usertune.c
patched libpurple/protocols/jabber/win32/posix.uname.c
patched libpurple/protocols/msn/cmdproc.c
patched libpurple/protocols/msn/cmdproc.h
patched libpurple/protocols/msn/contact.c
patched libpurple/protocols/msn/error.c
patched libpurple/protocols/msn/httpconn.c
patched libpurple/protocols/msn/msg.c
patched libpurple/protocols/msn/msn.c
patched libpurple/protocols/msn/nexus.c
patched libpurple/protocols/msn/notification.c
patched libpurple/protocols/msn/object.c
patched libpurple/protocols/msn/object.h
patched libpurple/protocols/msn/oim.c
patched libpurple/protocols/msn/sbconn.c
patched libpurple/protocols/msn/servconn.c
patched libpurple/protocols/msn/session.c
patched libpurple/protocols/msn/slp.c
patched libpurple/protocols/msn/slpcall.c
patched libpurple/protocols/msn/slplink.c
patched libpurple/protocols/msn/switchboard.c
patched libpurple/protocols/msn/switchboard.h
patched libpurple/protocols/msn/user.c
patched libpurple/protocols/msn/userlist.c
patched libpurple/protocols/msn/xfer.c
patched libpurple/protocols/mxit/actions.c
patched libpurple/protocols/mxit/cipher.c
patched libpurple/protocols/mxit/cipher.h
patched libpurple/protocols/mxit/filexfer.c
patched libpurple/protocols/mxit/formcmds.c
patched libpurple/protocols/mxit/http.c
patched libpurple/protocols/mxit/login.c
patched libpurple/protocols/mxit/markup.c
patched libpurple/protocols/mxit/markup.h
patched libpurple/protocols/mxit/multimx.c
patched libpurple/protocols/mxit/mxit.c
patched libpurple/protocols/mxit/mxit.h
patched libpurple/protocols/mxit/profile.c
patched libpurple/protocols/mxit/profile.h
patched libpurple/protocols/mxit/protocol.c
patched libpurple/protocols/mxit/protocol.h
patched libpurple/protocols/mxit/roster.c
patched libpurple/protocols/mxit/roster.h
patched libpurple/protocols/mxit/splashscreen.c
patched libpurple/protocols/mxit/voicevideo.c
patched libpurple/protocols/myspace/myspace.c
patched libpurple/protocols/myspace/user.c
patched libpurple/protocols/myspace/zap.c
patched libpurple/protocols/novell/novell.c
patched libpurple/protocols/null/nullprpl.c
patched libpurple/protocols/oscar/authorization.c
patched libpurple/protocols/oscar/clientlogin.c
patched libpurple/protocols/oscar/family_feedbag.c
patched libpurple/protocols/oscar/family_icbm.c
patched libpurple/protocols/oscar/flap_connection.c
patched libpurple/protocols/oscar/libaim.c
patched libpurple/protocols/oscar/libicq.c
patched libpurple/protocols/oscar/oft.c
patched libpurple/protocols/oscar/oscar.c
patched libpurple/protocols/oscar/oscar.h
patched libpurple/protocols/oscar/oscar_data.c
patched libpurple/protocols/oscar/peer.c
patched libpurple/protocols/oscar/userinfo.c
patched libpurple/protocols/oscar/visibility.c
patched libpurple/protocols/sametime/sametime.c
patched libpurple/protocols/silc/buddy.c
patched libpurple/protocols/silc/chat.c
patched libpurple/protocols/silc/ft.c
patched libpurple/protocols/silc/ops.c
patched libpurple/protocols/silc/pk.c
patched libpurple/protocols/silc/silc.c
patched libpurple/protocols/silc/silcpurple.h
patched libpurple/protocols/silc/util.c
patched libpurple/protocols/silc/wb.c
patched libpurple/protocols/simple/simple.c
patched libpurple/protocols/yahoo/libyahoo.c
patched libpurple/protocols/yahoo/libyahoojp.c
patched libpurple/protocols/yahoo/libymsg.c
patched libpurple/protocols/yahoo/libymsg.h
patched libpurple/protocols/yahoo/util.c
patched libpurple/protocols/yahoo/yahoo_aliases.c
patched libpurple/protocols/yahoo/yahoo_doodle.c
patched libpurple/protocols/yahoo/yahoo_filexfer.c
patched libpurple/protocols/yahoo/yahoo_friend.c
patched libpurple/protocols/yahoo/yahoo_packet.c
patched libpurple/protocols/yahoo/yahoo_picture.c
patched libpurple/protocols/yahoo/yahoo_profile.c
patched libpurple/protocols/yahoo/yahoochat.c
patched libpurple/protocols/yahoo/ycht.c
patched libpurple/protocols/zephyr/ZAsyncLocate.c
patched libpurple/protocols/zephyr/ZInit.c
patched libpurple/protocols/zephyr/ZRetSubs.c
patched libpurple/protocols/zephyr/Zinternal.c
patched libpurple/protocols/zephyr/zephyr.c
patched libpurple/proxy.c
patched libpurple/proxy.h
patched libpurple/prpl.c
patched libpurple/prpl.h
patched libpurple/purple.h.in
patched libpurple/request.c
patched libpurple/request.h
patched libpurple/roomlist.c
patched libpurple/roomlist.h
patched libpurple/savedstatuses.c
patched libpurple/server.c
patched libpurple/server.h
patched libpurple/smiley.h
patched libpurple/sound-theme.c
patched libpurple/sound-theme.h
patched libpurple/sound.h
patched libpurple/sslconn.c
patched libpurple/sslconn.h
patched libpurple/status.c
patched libpurple/status.h
patched libpurple/stringref.c
patched libpurple/stun.c
patched libpurple/tests/Makefile.am
patched libpurple/tests/check_libpurple.c
patched libpurple/tests/test_util.c
patched libpurple/tests/tests.h
patched libpurple/theme-loader.c
patched libpurple/theme-loader.h
patched libpurple/theme.c
patched libpurple/theme.h
patched libpurple/upnp.c
patched libpurple/util.c
patched libpurple/util.h
patched libpurple/value.c
patched libpurple/value.h
patched libpurple/version.h.in
patched libpurple/whiteboard.c
patched libpurple/whiteboard.h
patched libpurple/win32/libc_interface.c
patched libpurple/win32/libc_interface.h
patched libpurple/win32/libc_internal.h
patched libpurple/xmlnode.c
patched libpurple/xmlnode.h
patched pidgin/Makefile.am
patched pidgin/Makefile.mingw
patched pidgin/gtkaccount.c
patched pidgin/gtkblist-theme.c
patched pidgin/gtkblist-theme.h
patched pidgin/gtkblist.c
patched pidgin/gtkblist.h
patched pidgin/gtkcertmgr.c
patched pidgin/gtkconn.c
patched pidgin/gtkconv.c
patched pidgin/gtkconv.h
patched pidgin/gtkdialogs.c
patched pidgin/gtkdialogs.h
patched pidgin/gtkdocklet.c
patched pidgin/gtkdocklet.h
patched pidgin/gtkft.c
patched pidgin/gtkicon-theme.c
patched pidgin/gtkicon-theme.h
patched pidgin/gtkimhtml.c
patched pidgin/gtkimhtml.h
patched pidgin/gtkimhtmltoolbar.h
patched pidgin/gtklog.c
patched pidgin/gtklog.h
patched pidgin/gtkmain.c
patched pidgin/gtkmedia.c
patched pidgin/gtknotify.c
patched pidgin/gtkpounce.c
patched pidgin/gtkprefs.c
patched pidgin/gtkprefs.h
patched pidgin/gtkprivacy.c
patched pidgin/gtkrequest.c
patched pidgin/gtkroomlist.c
patched pidgin/gtksmiley.c
patched pidgin/gtksmiley.h
patched pidgin/gtksound.c
patched pidgin/gtksound.h
patched pidgin/gtkstatusbox.c
patched pidgin/gtkthemes.c
patched pidgin/gtkthemes.h
patched pidgin/gtkutils.c
patched pidgin/gtkutils.h
patched pidgin/gtkwhiteboard.c
patched pidgin/pidgin-3-uninstalled.pc.in
patched pidgin/pidgin-3.pc.in
patched pidgin/pidgintooltip.h
patched pidgin/pixmaps/Makefile.am
patched pidgin/plugins/Makefile.am
patched pidgin/plugins/gestures/gestures.c
patched pidgin/plugins/gevolution/gevo-util.c
patched pidgin/plugins/gevolution/gevolution.c
patched pidgin/plugins/history.c
patched pidgin/plugins/musicmessaging/musicmessaging.c
patched pidgin/plugins/notify.c
patched pidgin/plugins/perl/common/GtkBlist.xs
patched pidgin/plugins/perl/common/GtkDialogs.xs
patched pidgin/plugins/perl/common/GtkIMHtml.xs
patched pidgin/plugins/relnot.c
patched pidgin/plugins/xmppconsole.c
patched pidgin/win32/untar.h
patched po/ChangeLog
patched po/POTFILES.in
patched po/af.po
patched po/am.po
patched po/ar.po
patched po/as.po
patched po/az.po
patched po/be at latin.po
patched po/bg.po
patched po/bn.po
patched po/bn_IN.po
patched po/bs.po
patched po/ca.po
patched po/ca at valencia.po
patched po/cs.po
patched po/da.po
patched po/de.po
patched po/dz.po
patched po/el.po
patched po/en_AU.po
patched po/en_CA.po
patched po/en_GB.po
patched po/eo.po
patched po/es.po
patched po/et.po
patched po/eu.po
patched po/fa.po
patched po/fi.po
patched po/fr.po
patched po/ga.po
patched po/gl.po
patched po/gu.po
patched po/he.po
patched po/hi.po
patched po/hr.po
patched po/hu.po
patched po/hy.po
patched po/id.po
patched po/it.po
patched po/ja.po
patched po/ka.po
patched po/km.po
patched po/kn.po
patched po/ko.po
patched po/ku.po
patched po/lo.po
patched po/lt.po
patched po/mai.po
patched po/mhr.po
patched po/mk.po
patched po/ml.po
patched po/mn.po
patched po/mr.po
patched po/ms_MY.po
patched po/my_MM.po
patched po/nb.po
patched po/ne.po
patched po/nl.po
patched po/nn.po
patched po/oc.po
patched po/or.po
patched po/pa.po
patched po/pl.po
patched po/ps.po
patched po/pt.po
patched po/pt_BR.po
patched po/ro.po
patched po/ru.po
patched po/si.po
patched po/sk.po
patched po/sl.po
patched po/sq.po
patched po/sr.po
patched po/sr at latin.po
patched po/sv.po
patched po/sw.po
patched po/ta.po
patched po/te.po
patched po/th.po
patched po/tr.po
patched po/uk.po
patched po/ur.po
patched po/vi.po
patched po/xh.po
patched po/zh_CN.po
patched po/zh_HK.po
patched po/zh_TW.po
Changes against parent d4b4e9e27413e440c6b017ab62b923de305d3aa2
patched libpurple/protocols/jabber/jingle/jingle.h
More information about the Commits
mailing list