im.pidgin.gobjectification: 2112cc163442484243667c3d3d13d54aea271408

[grim at pidgin.im]

-----------------------------------------------------------------
Revision: 2112cc163442484243667c3d3d13d54aea271408
Ancestor: 101d57a297f1cecee0fd599640816bf37122c72b
Ancestor: 50c0ed0d3103cf346c8412d88694122c47a0af5e
Author: grim at pidgin.im
Date: 2007-10-28T04:12:19
Branch: im.pidgin.gobjectification

Added files:
        doc/hierarchy.dot libpurple/descipher.c
        libpurple/descipher.h libpurple/marshallers.list
        libpurple/md4cipher.c libpurple/md4cipher.h
        libpurple/md5cipher.c libpurple/md5cipher.h
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/adhoccommands.h
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/caps.h
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/pep.h
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/jabber/ping.h
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/jabber/usermood.h
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/usernick.h
        libpurple/protocols/jabber/usertune.c
        libpurple/protocols/jabber/usertune.h
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/myspace/markup.h
        libpurple/protocols/myspace/session.c
        libpurple/protocols/myspace/session.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h
        libpurple/protocols/myspace/zap.c
        libpurple/protocols/myspace/zap.h libpurple/sha1cipher.c
        libpurple/sha1cipher.h
        pidgin/pixmaps/status/11/rtl/Makefile.am
        pidgin/pixmaps/status/11/rtl/Makefile.mingw
        pidgin/pixmaps/status/11/rtl/extended-away.png
Added directories:
        pidgin/pixmaps/status/11/rtl
Modified files:
        .mtn-ignore COPYRIGHT ChangeLog ChangeLog.API configure.ac
        doc/funniest_home_convos.txt finch/gntconv.c finch/gntconv.h
        finch/gntsound.c finch/gntsound.h finch/libgnt/gntslider.c
        finch/libgnt/gntslider.h libpurple/Makefile.am
        libpurple/account.c libpurple/account.h libpurple/blist.c
        libpurple/cipher.c libpurple/cipher.h libpurple/connection.c
        libpurple/connection.h libpurple/core.c libpurple/network.c
        libpurple/ntlm.c libpurple/plugin.h
        libpurple/plugins/Makefile.am
        libpurple/plugins/signals-test.c
        libpurple/protocols/Makefile.am
        libpurple/protocols/Makefile.mingw
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/gg/gg.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/message.h
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/parser.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/presence.h
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/jabber/xdata.h
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/myspace/CHANGES
        libpurple/protocols/myspace/Makefile.am
        libpurple/protocols/myspace/Makefile.mingw
        libpurple/protocols/myspace/README
        libpurple/protocols/myspace/message.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/myspace/persist.h
        libpurple/protocols/myspace/release.sh
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/file_trans.c
        libpurple/protocols/qq/qq_proxy.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_crypt.c libpurple/proxy.c
        libpurple/prpl.c libpurple/prpl.h libpurple/request.c
        libpurple/request.h libpurple/server.c libpurple/server.h
        libpurple/signals.c libpurple/signals.h libpurple/sslconn.c
        libpurple/sslconn.h libpurple/status.h
        libpurple/tests/test_cipher.c libpurple/util.c
        libpurple/util.h libpurple/xmlnode.c libpurple/xmlnode.h
        pidgin/gtkblist.c pidgin/gtkblist.h pidgin/gtkconv.c
        pidgin/gtkdialogs.c pidgin/gtkimhtmltoolbar.c
        pidgin/gtkimhtmltoolbar.h pidgin/gtkrequest.c
        pidgin/pidgin.h pidgin/pidginstock.c pidgin/pidginstock.h
        pidgin/pixmaps/status/11/Makefile.am
        pidgin/plugins/Makefile.am pidgin/plugins/spellchk.c
        pidgin/win32/nsis/pidgin-installer.nsi po/pt_BR.po
Modified attrs:
        pidgin/pixmaps/status/11/rtl/extended-away.png

ChangeLog: 

explicit merge of '50c0ed0d3103cf346c8412d88694122c47a0af5e'
              and '101d57a297f1cecee0fd599640816bf37122c72b'