pidgin: 64869f28: merge of '217103c3e954ff2d295a6590ad3477...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 64869f284f4934e2f05446fc3d50960b6296ad5b
Ancestor: 217103c3e954ff2d295a6590ad3477d357894f9c
Ancestor: 8236b21b0ace69ab22e8e92711a7f8062e277abf
Author: sadrul at pidgin.im
Date: 2008-05-25T16:18:15
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/64869f284f4934e2f05446fc3d50960b6296ad5b

Renamed entries:
        libpurple/protocols/zephyr/zephyr.h to libpurple/protocols/zephyr/zephyr_internal.h
Modified files:
        libpurple/protocols/zephyr/Makefile.am
        libpurple/protocols/zephyr/internal.h
        libpurple/protocols/zephyr/zephyr.c libpurple/smiley.c
        libpurple/smiley.h pidgin/gtkconv.c pidgin/gtkdialogs.c
        pidgin/gtksmiley.c

ChangeLog: 

merge of '217103c3e954ff2d295a6590ad3477d357894f9c'
     and '8236b21b0ace69ab22e8e92711a7f8062e277abf'