cpw.malu.xmpp.jingle_ft: 60bf2996: merge of '26442f037db45ed1211149fde4ef6b...

Wed Aug 12 17:26:06 EDT 2009

-----------------------------------------------------------------
Revision: 60bf299699fc79135618d90437b614713a06fa94
Ancestor: 26442f037db45ed1211149fde4ef6bb565fa3b36
Ancestor: 83261fe23f1db5843b5b4df8b8c1771d7fba8707
Author: malu at pidgin.im
Date: 2009-08-12T21:19:45
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/60bf299699fc79135618d90437b614713a06fa94

Modified files:
        libpurple/ft.c libpurple/ft.h libpurple/media.c
        libpurple/mediamanager.c libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/jingle/file-transfer.c

ChangeLog: 

merge of '26442f037db45ed1211149fde4ef6bb565fa3b36'
     and '83261fe23f1db5843b5b4df8b8c1771d7fba8707'