soc.2008.vv: 02add41f: merge of '77e249bc561fc09bc5fe8f9c6f8b57...

maiku at soc.pidgin.im maiku at soc.pidgin.im
Fri Jul 18 23:16:10 EDT 2008


-----------------------------------------------------------------
Revision: 02add41f00f6d38d130d85acfe142b64f37c79fe
Ancestor: 77e249bc561fc09bc5fe8f9c6f8b573701b5d63d
Ancestor: fca38a4d41e1b8322fa295cbfaa98418b980b2a4
Author: maiku at soc.pidgin.im
Date: 2008-07-19T03:10:38
Branch: im.pidgin.soc.2008.vv
URL: http://d.pidgin.im/viewmtn/revision/info/02add41f00f6d38d130d85acfe142b64f37c79fe

Modified files:
        finch/gntmedia.c libpurple/media.h
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/qq/AUTHORS
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_status.c
        libpurple/protocols/qq/char_conv.c
        libpurple/protocols/qq/char_conv.h
        libpurple/protocols/qq/group_conv.c
        libpurple/protocols/qq/group_free.c
        libpurple/protocols/qq/group_info.c
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/qq.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_trans.c
        libpurple/protocols/qq/qq_trans.h
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/yahoo/yahoo_profile.c libpurple/prpl.c
        libpurple/prpl.h libpurple/server.c libpurple/server.h
        pidgin/gtkaccount.c pidgin/gtkconv.c

ChangeLog: 

merge of '77e249bc561fc09bc5fe8f9c6f8b573701b5d63d'
     and 'fca38a4d41e1b8322fa295cbfaa98418b980b2a4'



More information about the Commits mailing list