pidgin: f5a91436: merge of '2eb97f7d46ac5955e6a217661513d2...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: f5a914362b6261d947446f1369d46fd8d936b9d4
Ancestor: 2eb97f7d46ac5955e6a217661513d28e3b5ce060
Ancestor: 4ae935a838132794ea30db892805e76c69e4a45e
Author: sadrul at pidgin.im
Date: 2008-04-01T22:25:33
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f5a914362b6261d947446f1369d46fd8d936b9d4

Modified files:
        .mtn-ignore ChangeLog libpurple/protocols/myspace/myspace.c
        libpurple/win32/global.mak pidgin/pixmaps/Makefile.mingw
        pidgin/pixmaps/buddy_icons/qq/Makefile.mingw
        pidgin/pixmaps/emotes/default/24/Makefile.mingw
        pidgin/pixmaps/emotes/none/Makefile.mingw

ChangeLog: 

merge of '2eb97f7d46ac5955e6a217661513d28e3b5ce060'
     and '4ae935a838132794ea30db892805e76c69e4a45e'