pidgin.custom_smiley: 6e4fd05e: propagate from branch 'im.pidgin.pidgin'...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 6e4fd05eaddd93b079ba508657f640b1a1df9e55
Ancestor: 50551dcda7246e564389e053651a71209c09e94c
Ancestor: 6ff3e48f37ce327ca03e8d3394cac62e40b6fe05
Author: sadrul at pidgin.im
Date: 2008-03-07T21:32:09
Branch: im.pidgin.pidgin.custom_smiley
URL: http://d.pidgin.im/viewmtn/revision/info/6e4fd05eaddd93b079ba508657f640b1a1df9e55

Added files:
        libpurple/smiley.c libpurple/smiley.h pidgin/gtksmiley.c
        pidgin/gtksmiley.h
Modified files:
        ChangeLog configure.ac finch/gntblist.c finch/gntconv.c
        finch/gntsound.c finch/libgnt/gntentry.c
        libpurple/Makefile.am libpurple/Makefile.mingw
        libpurple/core.c libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/yahoo/yahoo.c libpurple/proxy.c
        libpurple/util.c libpurple/util.h pidgin/Makefile.am
        pidgin/Makefile.mingw pidgin/gtkblist.c pidgin/gtkconv.c
        pidgin/gtkimhtmltoolbar.c pidgin/gtkmain.c pidgin/gtksound.c
        pidgin/gtkthemes.c pidgin/gtkthemes.h pidgin/gtkutils.c
        po/POTFILES.in

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 6ff3e48f37ce327ca03e8d3394cac62e40b6fe05)
            to branch 'im.pidgin.pidgin.custom_smiley' (head 50551dcda7246e564389e053651a71209c09e94c)