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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: b717c8977f9b6c88b338cf20f9b0cbf0898d2de3
Ancestor: 18138050e9fb9b1187935fc3c037781906870fc1
Ancestor: cd4ab1e30725817663f30bcb4d6cbe22879b271f
Author: malu at pidgin.im
Date: 2009-10-26T22:16:17
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/b717c8977f9b6c88b338cf20f9b0cbf0898d2de3

Renamed entries:
        libpurple/protocols/jabber/JEPS to libpurple/protocols/jabber/XEPS
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
Modified files:
        ChangeLog finch/gntconn.c finch/gntconv.c
        libpurple/Makefile.am libpurple/account.c libpurple/cipher.c
        libpurple/plugins/perl/perl-handlers.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/XEPS
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/google.c
        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/libxmpp.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/yahoo/libymsg.c libpurple/server.c
        libpurple/theme-loader.c pidgin/gtkblist.c pidgin/gtkconn.c
        pidgin/gtkconv.c pidgin/gtkimhtml.c pidgin/gtkpounce.c
        pidgin/gtkprefs.c po/ca.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head cd4ab1e30725817663f30bcb4d6cbe22879b271f)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 18138050e9fb9b1187935fc3c037781906870fc1)