im.pidgin.gobjectification: 635f846b1457eb69078711c7d9327a410dd47964

grim at pidgin.im grim at pidgin.im
Sun Oct 28 00:47:42 EDT 2007


-----------------------------------------------------------------
Revision: 635f846b1457eb69078711c7d9327a410dd47964
Ancestor: 6f27404ac320d16e0ad382d508fc1773db1a82aa
Ancestor: ab014bb16c8cc1dd52eed1d90e131babc2a6e593
Author: grim at pidgin.im
Date: 2007-10-28T04:37:25
Branch: im.pidgin.gobjectification

Deleted entries:
        libpurple/protocols/jabber/.todo
        libpurple/protocols/oscar/.todo
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/sha1cipher.c libpurple/sha1cipher.h
        pidgin/pixmaps/emblems/16/music.png
        pidgin/pixmaps/emblems/16/scalable/music.svg
Modified files:
        ChangeLog configure.ac finch/finch.h finch/gntaccount.c
        finch/gntaccount.h finch/gntblist.c finch/gntblist.h
        finch/gntcertmgr.c finch/gntcertmgr.h finch/gntconn.c
        finch/gntconn.h finch/gntconv.c finch/gntconv.h
        finch/gntdebug.c finch/gntdebug.h finch/gntft.c
        finch/gntft.h finch/gntidle.h finch/gntnotify.c
        finch/gntnotify.h finch/gntplugin.c finch/gntplugin.h
        finch/gntpounce.c finch/gntpounce.h finch/gntprefs.c
        finch/gntprefs.h finch/gntrequest.c finch/gntrequest.h
        finch/gntsound.c finch/gntsound.h finch/gntstatus.c
        finch/gntstatus.h libpurple/Makefile.am libpurple/account.c
        libpurple/account.h libpurple/accountopt.c
        libpurple/accountopt.h libpurple/blist.h
        libpurple/buddyicon.c libpurple/buddyicon.h
        libpurple/cipher.c libpurple/cipher.h libpurple/circbuffer.c
        libpurple/circbuffer.h libpurple/cmds.c libpurple/cmds.h
        libpurple/connection.c libpurple/connection.h
        libpurple/conversation.h libpurple/core.c libpurple/core.h
        libpurple/dbus-bindings.h libpurple/dbus-server.h
        libpurple/debug.c libpurple/debug.h libpurple/desktopitem.c
        libpurple/desktopitem.h libpurple/dnsquery.c
        libpurple/dnsquery.h libpurple/dnssrv.c libpurple/dnssrv.h
        libpurple/eventloop.c libpurple/eventloop.h libpurple/ft.c
        libpurple/ft.h libpurple/gaim-compat.h libpurple/idle.h
        libpurple/imgstore.c libpurple/imgstore.h
        libpurple/internal.h libpurple/log.c libpurple/log.h
        libpurple/nat-pmp.c libpurple/nat-pmp.h libpurple/network.c
        libpurple/network.h libpurple/notify.c libpurple/notify.h
        libpurple/ntlm.c libpurple/ntlm.h libpurple/plugin.h
        libpurple/pluginpref.h libpurple/plugins/Makefile.am
        libpurple/plugins/signals-test.c libpurple/pounce.c
        libpurple/pounce.h libpurple/prefs.h libpurple/privacy.h
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/usertune.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/myspace/Makefile.am
        libpurple/protocols/myspace/myspace.c
        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/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_crypt.c libpurple/proxy.c
        libpurple/proxy.h libpurple/prpl.h libpurple/request.c
        libpurple/request.h libpurple/roomlist.c
        libpurple/roomlist.h libpurple/savedstatuses.c
        libpurple/savedstatuses.h libpurple/server.c
        libpurple/server.h libpurple/signals.c libpurple/signals.h
        libpurple/sound.h libpurple/sslconn.c libpurple/sslconn.h
        libpurple/status.c libpurple/stringref.c
        libpurple/stringref.h libpurple/stun.c libpurple/stun.h
        libpurple/tests/test_cipher.c libpurple/upnp.c
        libpurple/upnp.h libpurple/util.c libpurple/util.h
        libpurple/value.c libpurple/value.h libpurple/version.c
        libpurple/whiteboard.h libpurple/xmlnode.c
        libpurple/xmlnode.h pidgin/gtkaccount.c pidgin/gtkaccount.h
        pidgin/gtkblist.c pidgin/gtkblist.h
        pidgin/gtkcellrendererexpander.c
        pidgin/gtkcellrendererprogress.c pidgin/gtkcertmgr.c
        pidgin/gtkconn.c pidgin/gtkconn.h pidgin/gtkconv.c
        pidgin/gtkconv.h pidgin/gtkconvwin.h pidgin/gtkdebug.c
        pidgin/gtkdebug.h pidgin/gtkdialogs.c pidgin/gtkdialogs.h
        pidgin/gtkdnd-hints.c pidgin/gtkdnd-hints.h
        pidgin/gtkeventloop.c pidgin/gtkeventloop.h pidgin/gtkft.c
        pidgin/gtkft.h pidgin/gtkgaim-compat.h pidgin/gtkidle.h
        pidgin/gtkimhtml.c pidgin/gtkimhtml.h
        pidgin/gtkimhtmltoolbar.c pidgin/gtklog.c pidgin/gtklog.h
        pidgin/gtkmenutray.h pidgin/gtknickcolors.h
        pidgin/gtknotify.c pidgin/gtknotify.h pidgin/gtkplugin.c
        pidgin/gtkplugin.h pidgin/gtkpluginpref.c
        pidgin/gtkpluginpref.h pidgin/gtkpounce.c pidgin/gtkpounce.h
        pidgin/gtkprefs.c pidgin/gtkprefs.h pidgin/gtkprivacy.c
        pidgin/gtkprivacy.h pidgin/gtkrequest.c pidgin/gtkrequest.h
        pidgin/gtkroomlist.c pidgin/gtkroomlist.h
        pidgin/gtksavedstatuses.c pidgin/gtksavedstatuses.h
        pidgin/gtkscrollbook.c pidgin/gtkscrollbook.h
        pidgin/gtksession.c pidgin/gtksession.h pidgin/gtksound.c
        pidgin/gtksound.h pidgin/gtkstatusbox.c
        pidgin/gtkstatusbox.h pidgin/gtkthemes.h pidgin/gtkutils.c
        pidgin/gtkutils.h pidgin/gtkwhiteboard.h pidgin/pidgin.h
        pidgin/pidginstock.c pidgin/pidginstock.h
        pidgin/pixmaps/emblems/16/Makefile.am
        pidgin/pixmaps/emblems/16/scalable/Makefile.am
        pidgin/pixmaps/emotes/default/24/default.theme.in
        pidgin/plugins/history.c pidgin/plugins/pidginrc.c
        pidgin.spec.in
Modified attrs:
        pidgin/pixmaps/emblems/16/music.png

ChangeLog: 

explicit merge of 'ab014bb16c8cc1dd52eed1d90e131babc2a6e593'
              and '6f27404ac320d16e0ad382d508fc1773db1a82aa'



More information about the Commits mailing list