Revision 272fca889e71925c5435932e6d8b4e9ad2864034

[seanegan at pidgin.im]

-----------------------------------------------------------------
Revision: 272fca889e71925c5435932e6d8b4e9ad2864034
Ancestor: 9f5274448f45f6503b6ea291ada3c4e0e00b8c52
Ancestor: db4583bc475b46b7cb9baa38229f12473d331870
Author: seanegan at pidgin.im
Date: 2007-09-15T20:35:41
Branch: im.pidgin.pidgin

Deleted entries:
        libpurple/protocols/jabber/.todo
        libpurple/protocols/oscar/.todo
Added files:
        pidgin/pixmaps/emblems/16/music.png
        pidgin/pixmaps/emblems/16/scalable/music.svg
Modified files:
        ChangeLog finch/gntconn.c finch/gntconv.c
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/usertune.c
        libpurple/protocols/myspace/myspace.c pidgin/gtkblist.c
        pidgin/gtkcellrendererexpander.c pidgin/gtkconv.c
        pidgin/gtkprefs.c pidgin/pixmaps/emblems/16/Makefile.am
        pidgin/pixmaps/emblems/16/scalable/Makefile.am
        pidgin/plugins/pidginrc.c
Modified attrs:
        pidgin/pixmaps/emblems/16/music.png

ChangeLog: 

merge of '9f5274448f45f6503b6ea291ada3c4e0e00b8c52'
     and 'db4583bc475b46b7cb9baa38229f12473d331870'


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