im.pidgin.pidgin: 6b1a373e3e69276313a52397e9213c08c1d67846

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 6b1a373e3e69276313a52397e9213c08c1d67846
Ancestor: 7a98d978e56502762335bda8f19011a139ac460a
Ancestor: d2959ce162eb97cc02e8a7f61fe9a804391fdd46
Author: markdoliner at pidgin.im
Date: 2007-11-13T18:00:22
Branch: im.pidgin.pidgin

Added files:
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/bonjour_ft.h
Modified files:
        ChangeLog ChangeLog.API Doxyfile.in Makefile.mingw
        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/network.c libpurple/network.h
        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/prpl.h
        libpurple/purple-uninstalled.pc.in libpurple/purple.pc.in
        libpurple/xmlnode.h pidgin/gtkblist.c pidgin/minidialog.h
        pidgin/pidgin-uninstalled.pc.in pidgin/pidgin.pc.in
        po/ChangeLog po/de.po

ChangeLog: 

merge of '7a98d978e56502762335bda8f19011a139ac460a'
     and 'd2959ce162eb97cc02e8a7f61fe9a804391fdd46'