cpw.malu.xmpp.jingle_ft: 29a7fd6e: propagate from branch 'im.pidgin.pidgin'...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 29a7fd6ea4adc11f3f6fec443704aef8a689f706
Ancestor: 68e699402650ba38372a1391f7c76e5c480909af
Ancestor: 7c76f200d8b976548ea95b94a1674b931a7694f7
Author: malu at pidgin.im
Date: 2010-04-09T22:13:57
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/29a7fd6ea4adc11f3f6fec443704aef8a689f706

Deleted entries:
        libpurple/protocols/msn/README
Added files:
        libpurple/protocols/jabber/jingle/file-transfer.c
        libpurple/protocols/jabber/jingle/file-transfer.h
        libpurple/protocols/jabber/jingle/ibbs.c
        libpurple/protocols/jabber/jingle/ibbs.h
        libpurple/protocols/jabber/jingle/s5b.c
        libpurple/protocols/jabber/jingle/s5b.h
        libpurple/protocols/jabber/xfer.c
        libpurple/protocols/jabber/xfer.h po/bn_IN.po
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API Makefile.am configure.ac
        doc/finch.1.in doc/gtkblist-signals.dox
        doc/gtkimhtml-signals.dox doc/gtkrc-2.0
        finch/libgnt/gntbox.c finch/libgnt/gntentry.c
        finch/libgnt/gntentry.h libpurple/certificate.c
        libpurple/certificate.h libpurple/ft.c
        libpurple/gconf/Makefile.am
        libpurple/plugins/perl/scripts/account.pl
        libpurple/plugins/perl/scripts/buddy_list.pl
        libpurple/plugins/perl/scripts/conversation.pl
        libpurple/plugins/perl/scripts/plugin_pref.pl
        libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/plugins/ssl/ssl-nss.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/gg/lib/common.c
        libpurple/protocols/gg/lib/libgadu.h
        libpurple/protocols/gg/lib/resolver.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/auth_cyrus.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/mxit/actions.c
        libpurple/protocols/mxit/profile.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/msgcookie.c
        libpurple/protocols/oscar/oft.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/oscar/peer.h
        libpurple/protocols/oscar/tlv.c
        libpurple/protocols/qq/group_info.c
        libpurple/protocols/qq/qq.c
        libpurple/protocols/yahoo/libyahoo.c
        libpurple/protocols/yahoo/libyahoojp.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/savedstatuses.c libpurple/util.c libpurple/util.h
        pidgin/gtkblist.c pidgin/gtkblist.h pidgin/gtkconv.c
        pidgin/gtkdialogs.c pidgin/gtkimhtml.c pidgin/gtkutils.c
        pidgin/gtkutils.h
        pidgin/plugins/gevolution/add_buddy_dialog.c
        pidgin/plugins/gevolution/gevo-util.c
        pidgin/plugins/gevolution/gevolution.c
        pidgin/plugins/gevolution/new_person_dialog.c po/ChangeLog
        po/POTFILES.in po/af.po po/am.po po/ar.po po/az.po
        po/be at latin.po po/bg.po po/bn.po po/bs.po po/ca.po
        po/ca at valencia.po po/cs.po po/da.po po/de.po po/dz.po
        po/el.po po/en_AU.po po/en_CA.po po/en_GB.po po/eo.po
        po/es.po po/et.po po/eu.po po/fa.po po/fi.po po/fr.po
        po/ga.po po/gl.po po/gu.po po/he.po po/hi.po po/hu.po
        po/hy.po po/id.po po/it.po po/ja.po po/ka.po po/km.po
        po/kn.po po/ko.po po/ku.po po/lo.po po/lt.po po/mk.po
        po/mn.po po/mr.po po/ms_MY.po po/my_MM.po po/nb.po po/ne.po
        po/nl.po po/nn.po po/oc.po po/or.po po/pa.po po/pl.po
        po/ps.po po/pt.po po/pt_BR.po po/ro.po po/ru.po po/si.po
        po/sk.po po/sl.po po/sq.po po/sr.po po/sr at latin.po po/sv.po
        po/sw.po po/ta.po po/te.po po/th.po po/tr.po po/uk.po
        po/ur.po po/vi.po po/xh.po po/zh_CN.po po/zh_HK.po
        po/zh_TW.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 7c76f200d8b976548ea95b94a1674b931a7694f7)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 68e699402650ba38372a1391f7c76e5c480909af)