cpw.malu.xmpp.jingle_ft: 601cba74: propagate from branch 'im.pidgin.pidgin'...
malu at pidgin.im
malu at pidgin.im
Mon Sep 6 16:00:47 EDT 2010
----------------------------------------------------------------------
Revision: 601cba741c2f748337d955ce319f50ece3b97264
Parent: 7b998c02b684a694f1089bee715e4a3952bbcf08
Parent: 9fa62b5ddaebe515cc677ecd686d8d857a863174
Author: malu at pidgin.im
Date: 09/06/10 15:58:35
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/601cba741c2f748337d955ce319f50ece3b97264
Changelog:
propagate from branch 'im.pidgin.pidgin' (head 7b998c02b684a694f1089bee715e4a3952bbcf08)
to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 9fa62b5ddaebe515cc677ecd686d8d857a863174)
Changes against parent 7b998c02b684a694f1089bee715e4a3952bbcf08
added libpurple/protocols/jabber/jingle/file-transfer.c
added libpurple/protocols/jabber/jingle/file-transfer.h
added libpurple/protocols/jabber/jingle/ibbs.c
added libpurple/protocols/jabber/jingle/ibbs.h
added libpurple/protocols/jabber/jingle/s5b.c
added libpurple/protocols/jabber/jingle/s5b.h
added libpurple/protocols/jabber/socks5.c
added libpurple/protocols/jabber/socks5.h
added libpurple/protocols/jabber/xfer.c
added libpurple/protocols/jabber/xfer.h
patched libpurple/ft.c
patched libpurple/protocols/jabber/Makefile.am
patched libpurple/protocols/jabber/Makefile.mingw
patched libpurple/protocols/jabber/data.c
patched libpurple/protocols/jabber/jabber.c
patched libpurple/protocols/jabber/jingle/jingle.c
patched libpurple/protocols/jabber/jingle/jingle.h
patched libpurple/protocols/jabber/jingle/rtp.c
patched libpurple/protocols/jabber/jingle/session.c
patched libpurple/protocols/jabber/jingle/session.h
patched libpurple/protocols/jabber/libxmpp.c
patched libpurple/protocols/jabber/si.c
Changes against parent 9fa62b5ddaebe515cc677ecd686d8d857a863174
dropped libpurple/protocols/jabber/google.c
dropped libpurple/protocols/jabber/google.h
dropped pidgin/pixmaps/emotes/small/16/cool.png
dropped pidgin/pixmaps/emotes/small/16/grin.png
dropped pidgin/win32/IdleTracker
dropped pidgin/win32/IdleTracker/Makefile.mingw
dropped pidgin/win32/IdleTracker/idletrack.c
dropped pidgin/win32/IdleTracker/idletrack.h
added libpurple/protocols/jabber/google
added libpurple/protocols/jabber/google/gmail.c
added libpurple/protocols/jabber/google/gmail.h
added libpurple/protocols/jabber/google/google.c
added libpurple/protocols/jabber/google/google.h
added libpurple/protocols/jabber/google/google_presence.c
added libpurple/protocols/jabber/google/google_presence.h
added libpurple/protocols/jabber/google/google_roster.c
added libpurple/protocols/jabber/google/google_roster.h
added libpurple/protocols/jabber/google/google_session.c
added libpurple/protocols/jabber/google/google_session.h
added libpurple/protocols/jabber/google/jingleinfo.c
added libpurple/protocols/jabber/google/jingleinfo.h
added libpurple/protocols/jabber/google/relay.c
added libpurple/protocols/jabber/google/relay.h
added pidgin/pixmaps/emotes/small/16/glasses-cool.png
added pidgin/pixmaps/emotes/small/16/thunder.png
patched COPYRIGHT
patched ChangeLog
patched ChangeLog.API
patched finch/gntaccount.c
patched finch/gntft.c
patched finch/gntft.h
patched finch/libgnt/gntentry.c
patched libpurple/account.c
patched libpurple/conversation.c
patched libpurple/desktopitem.c
patched libpurple/ft.c
patched libpurple/ft.h
patched libpurple/media/backend-fs2.c
patched libpurple/media/codec.c
patched libpurple/media/codec.h
patched libpurple/media.c
patched libpurple/network.c
patched libpurple/network.h
patched libpurple/plugins/idle.c
patched libpurple/plugins/perl/common/BuddyList.xs
patched libpurple/plugins/perl/common/Server.xs
patched libpurple/plugins/signals-test.c
patched libpurple/prefs.c
patched libpurple/protocols/bonjour/bonjour.c
patched libpurple/protocols/jabber/Makefile.am
patched libpurple/protocols/jabber/Makefile.mingw
patched libpurple/protocols/jabber/auth.c
patched libpurple/protocols/jabber/auth_cyrus.c
patched libpurple/protocols/jabber/buddy.c
patched libpurple/protocols/jabber/disco.c
patched libpurple/protocols/jabber/iq.c
patched libpurple/protocols/jabber/jabber.c
patched libpurple/protocols/jabber/jabber.h
patched libpurple/protocols/jabber/jingle/jingle.c
patched libpurple/protocols/jabber/jingle/jingle.h
patched libpurple/protocols/jabber/jingle/rtp.c
patched libpurple/protocols/jabber/jingle/transport.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/roster.c
patched libpurple/protocols/jabber/si.c
patched libpurple/protocols/msn/contact.c
patched libpurple/protocols/msn/httpconn.c
patched libpurple/protocols/msn/msn.c
patched libpurple/protocols/msn/msnutils.c
patched libpurple/protocols/msn/notification.c
patched libpurple/protocols/msn/session.c
patched libpurple/protocols/msn/slp.c
patched libpurple/protocols/msn/slplink.c
patched libpurple/protocols/msn/switchboard.c
patched libpurple/protocols/oscar/family_icbm.c
patched libpurple/protocols/oscar/oft.c
patched libpurple/protocols/oscar/oscar.c
patched libpurple/protocols/qq/ChangeLog
patched libpurple/protocols/qq/buddy_info.c
patched libpurple/protocols/qq/buddy_list.c
patched libpurple/protocols/qq/buddy_opt.c
patched libpurple/protocols/qq/file_trans.c
patched libpurple/protocols/qq/group.c
patched libpurple/protocols/qq/group_im.c
patched libpurple/protocols/qq/group_join.c
patched libpurple/protocols/qq/group_opt.c
patched libpurple/protocols/qq/im.c
patched libpurple/protocols/qq/qq.c
patched libpurple/protocols/qq/qq_base.c
patched libpurple/protocols/qq/qq_network.c
patched libpurple/protocols/qq/qq_process.c
patched libpurple/protocols/qq/qq_trans.c
patched libpurple/protocols/qq/send_file.c
patched libpurple/protocols/sametime/sametime.c
patched libpurple/protocols/silc/chat.c
patched libpurple/protocols/silc/ops.c
patched libpurple/protocols/silc/silcpurple.h
patched libpurple/protocols/silc10/chat.c
patched libpurple/protocols/silc10/ops.c
patched libpurple/protocols/silc10/silcpurple.h
patched libpurple/protocols/yahoo/libymsg.c
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_doodle.h
patched libpurple/protocols/yahoo/yahoo_filexfer.c
patched libpurple/protocols/yahoo/yahoochat.c
patched libpurple/request.c
patched libpurple/stun.c
patched libpurple/util.c
patched libpurple/win32/global.mak
patched libpurple/win32/targets.mak
patched libpurple/win32/win32dep.c
patched pidgin/Makefile.mingw
patched pidgin/gtkblist.c
patched pidgin/gtkconv.c
patched pidgin/gtkdialogs.c
patched pidgin/gtkft.c
patched pidgin/gtkft.h
patched pidgin/gtkidle.c
patched pidgin/gtkimhtml.c
patched pidgin/gtkimhtmltoolbar.c
patched pidgin/gtkplugin.c
patched pidgin/gtkpounce.c
patched pidgin/gtkprefs.c
patched pidgin/gtkroomlist.c
patched pidgin/gtksession.c
patched pidgin/gtksmiley.c
patched pidgin/gtkstatusbox.c
patched pidgin/gtkutils.c
patched pidgin/pidginstock.h
patched pidgin/pixmaps/emotes/default/24/default.theme.in
patched pidgin/pixmaps/emotes/small/16/Makefile.am
patched pidgin/pixmaps/emotes/small/16/small.theme.in
patched pidgin/plugins/gevolution/add_buddy_dialog.c
patched pidgin/plugins/gevolution/gevo-util.c
patched pidgin/plugins/gevolution/gevolution.c
patched pidgin/plugins/gevolution/new_person_dialog.c
patched pidgin/plugins/notify.c
patched pidgin/plugins/vvconfig.c
patched pidgin/win32/gtkwin32dep.c
patched pidgin/win32/gtkwin32dep.h
patched pidgin/win32/nsis/pidgin-installer.nsi
patched pidgin/win32/winpidgin.c
patched pidgin/win32/wspell.c
patched pidgin.spec.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/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/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
attr on pidgin/pixmaps/emotes/small/16/glasses-cool.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/thunder.png
set mtn:manual_merge
to true
More information about the Commits
mailing list