pidgin.next.minor: 63bbded7: merge of '0990bc18c1ec4f05a29aeb8f55d4d2...

Tue Jan 5 12:50:59 EST 2010

-----------------------------------------------------------------
Revision: 63bbded7257d603ff4c002350caa652f85d2ff9e
Ancestor: 0990bc18c1ec4f05a29aeb8f55d4d28a08152cc6
Ancestor: d5e93b05ae1a8f5296a0a9b069c630630285d3c3
Author: rekkanoryo at pidgin.im
Date: 2009-12-25T21:33:50
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/63bbded7257d603ff4c002350caa652f85d2ff9e

Added files:
        libpurple/purple-2-uninstalled.pc.in
        libpurple/purple-2.pc.in pidgin/pidgin-2-uninstalled.pc.in
        pidgin/pidgin-2.pc.in
Modified files:
        ChangeLog configure.ac libpurple/certificate.c
        libpurple/media/codec.h libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h
        libpurple/purple-uninstalled.pc.in libpurple/purple.pc.in
        pidgin/gtkdialogs.c pidgin/pidgin-uninstalled.pc.in
        pidgin/pidgin.pc.in

ChangeLog: 

merge of '0990bc18c1ec4f05a29aeb8f55d4d28a08152cc6'
     and 'd5e93b05ae1a8f5296a0a9b069c630630285d3c3'