im.pidgin.pidgin: 6876f96b926c6734531d2353ef014328769d2ae6

Wed Feb 13 01:00:47 EST 2008

-----------------------------------------------------------------
Revision: 6876f96b926c6734531d2353ef014328769d2ae6
Ancestor: 29e93f056359d961762bcff9702089c1cf491fd0
Ancestor: 7fa0ba16bbd2bff9027acc0c4e408c3a9df3854b
Author: sadrul at pidgin.im
Date: 2008-02-13T06:00:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6876f96b926c6734531d2353ef014328769d2ae6

Modified files:
        finch/libgnt/gntbutton.c finch/libgnt/gntcombobox.c
        finch/libgnt/gntentry.c finch/libgnt/gntfilesel.c
        finch/libgnt/gnttree.c libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_filexfer.c

ChangeLog: 

merge of '29e93f056359d961762bcff9702089c1cf491fd0'
     and '7fa0ba16bbd2bff9027acc0c4e408c3a9df3854b'