im.pidgin.pidgin: af42002047d95678720311b8bed8776ceda1142a

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: af42002047d95678720311b8bed8776ceda1142a
Ancestor: aa714a29059f790cb003a8fe1bec9c8873d09e33
Ancestor: d92a21a7dca2f2c4abb6371abea83d5ab4f28b10
Author: datallah at pidgin.im
Date: 2007-11-12T23:10:08
Branch: im.pidgin.pidgin

Added files:
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/bonjour_ft.h
Modified files:
        ChangeLog ChangeLog.win32 Doxyfile.in Makefile.mingw
        doc/pidgin.1.in finch/finch.pc.in finch/gntblist.c
        finch/libgnt/gntmenu.c finch/libgnt/gnttextview.c
        finch/libgnt/gntwidget.c finch/libgnt/gntwindow.c
        finch/libgnt/gntwindow.h finch/libgnt/gntwm.c
        libpurple/protocols/bonjour/Makefile.am
        libpurple/protocols/bonjour/Makefile.mingw
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/bonjour.h
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/jabber.h
        libpurple/protocols/silc/silc.c
        libpurple/purple-uninstalled.pc.in libpurple/purple.pc.in
        pidgin/gtkblist.c pidgin/gtkmain.c
        pidgin/pidgin-uninstalled.pc.in pidgin/pidgin.pc.in
        po/ChangeLog po/de.po

ChangeLog: 

merge of 'aa714a29059f790cb003a8fe1bec9c8873d09e33'
     and 'd92a21a7dca2f2c4abb6371abea83d5ab4f28b10'