Revision b7682326cf00c479a3e87894b94d19c992e32ab6

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: b7682326cf00c479a3e87894b94d19c992e32ab6
Ancestor: e6a26aab7c177405a9cbb8d8358228ed4a53d508
Ancestor: e885dc139c026cbbb5d55f8509a1c63468bd80b6
Author: sadrul at pidgin.im
Date: 2007-08-26T14:02:35
Branch: im.pidgin.pidgin

Added files:
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/myspace/markup.h
        libpurple/protocols/myspace/session.c
        libpurple/protocols/myspace/session.h
        libpurple/protocols/myspace/zap.c
        libpurple/protocols/myspace/zap.h
Modified files:
        ChangeLog finch/gntconv.c finch/gntconv.h finch/gntsound.c
        finch/gntsound.h libpurple/protocols/myspace/Makefile.am
        libpurple/protocols/myspace/Makefile.mingw
        libpurple/protocols/myspace/message.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/myspace/persist.h
        libpurple/protocols/yahoo/yahoo.c

ChangeLog: 

merge of 'e6a26aab7c177405a9cbb8d8358228ed4a53d508'
     and 'e885dc139c026cbbb5d55f8509a1c63468bd80b6'


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