Revision 147124060f5119dfa16b7eef6a622a9075b85f77

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 147124060f5119dfa16b7eef6a622a9075b85f77
Ancestor: 416bcb7701d6018a64d105d7728c5ed19a264dfe
Ancestor: cc9ade4ea5f27b43306d1091a7bb08505b55c717
Author: nosnilmot at pidgin.im
Date: 2007-05-30T02:08:37
Branch: im.pidgin.pidgin

Added files:
        libpurple/protocols/null/Makefile.am
        libpurple/protocols/null/Makefile.mingw
        libpurple/protocols/null/README
        libpurple/protocols/null/nullprpl.c
Added directories:
        libpurple/protocols/null
Modified files:
        COPYRIGHT ChangeLog configure.ac
        libpurple/protocols/Makefile.am
        libpurple/protocols/Makefile.mingw
        libpurple/protocols/gg/gg.c libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/oscar/family_admin.c
        libpurple/protocols/oscar/family_alert.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_bos.c
        libpurple/protocols/oscar/family_buddy.c
        libpurple/protocols/oscar/family_chat.c
        libpurple/protocols/oscar/family_chatnav.c
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/family_odir.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/family_popup.c
        libpurple/protocols/oscar/family_userlookup.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/tlv.c
        libpurple/protocols/silc/silc.c pidgin/gtkaccount.c
        pidgin/gtkblist.c pidgin/gtkprefs.c pidgin/pidginstock.c
        pidgin/pidginstock.h pidgin/pixmaps/emotes/default/22/theme
        po/POTFILES.skip

ChangeLog: 

merge of '416bcb7701d6018a64d105d7728c5ed19a264dfe'
     and 'cc9ade4ea5f27b43306d1091a7bb08505b55c717'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 147124060f5119dfa16b7eef6a622a9075b85f77