pidgin: aa098981: merge of 'a3016031fd5b2669070b7d99b30187...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: aa098981a4e43aee11d1d3b733f5c6d95e727449
Ancestor: a3016031fd5b2669070b7d99b301874a29269f18
Ancestor: a4c334b8d35bb414e74cc95f9ca21465182136de
Author: markdoliner at pidgin.im
Date: 2008-08-21T21:17:42
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/aa098981a4e43aee11d1d3b733f5c6d95e727449

Added files:
        pidgin/pixmaps/emotes/default/24/scalable/bunny.svg
Modified files:
        ChangeLog configure.ac libpurple/plugins/joinpart.c
        libpurple/protocols/msn/notification.c pidgin/gtkaccount.c
        pidgin/pixmaps/emotes/default/24/scalable/airplane.svg
        pidgin/pixmaps/emotes/default/24/scalable/bad.svg
        pidgin/pixmaps/emotes/default/24/scalable/beer.svg
        pidgin/pixmaps/emotes/default/24/scalable/bomb.svg
        pidgin/pixmaps/emotes/default/24/scalable/bowl.svg
        pidgin/pixmaps/emotes/default/24/scalable/boy.svg
        pidgin/pixmaps/emotes/default/24/scalable/brb.svg
        pidgin/pixmaps/emotes/default/24/scalable/cake.svg
        pidgin/pixmaps/emotes/default/24/scalable/camera.svg
        pidgin/pixmaps/emotes/default/24/scalable/car.svg
        pidgin/pixmaps/emotes/default/24/scalable/cat.svg
        pidgin/pixmaps/emotes/default/24/scalable/cigarette.svg
        pidgin/pixmaps/emotes/default/24/scalable/clock.svg
        pidgin/pixmaps/emotes/default/24/scalable/coffee.svg
        pidgin/pixmaps/emotes/default/24/scalable/coins.svg
        pidgin/pixmaps/emotes/default/24/scalable/computer.svg
        pidgin/pixmaps/emotes/default/24/scalable/console.svg
        pidgin/pixmaps/emotes/default/24/scalable/dog.svg
        pidgin/pixmaps/emotes/default/24/scalable/drink.svg
        pidgin/pixmaps/emotes/default/24/scalable/film.svg
        pidgin/pixmaps/emotes/default/24/scalable/girl.svg
        pidgin/pixmaps/emotes/default/24/scalable/goat.svg
        pidgin/pixmaps/emotes/default/24/scalable/good.svg
        pidgin/pixmaps/emotes/default/24/scalable/handcuffs.svg
        pidgin/pixmaps/emotes/default/24/scalable/island.svg
        pidgin/pixmaps/emotes/default/24/scalable/lamp.svg
        pidgin/pixmaps/emotes/default/24/scalable/love-over.svg
        pidgin/pixmaps/emotes/default/24/scalable/love.svg
        pidgin/pixmaps/emotes/default/24/scalable/mail.svg
        pidgin/pixmaps/emotes/default/24/scalable/mobile.svg
        pidgin/pixmaps/emotes/default/24/scalable/moon.svg
        pidgin/pixmaps/emotes/default/24/scalable/msn.svg
        pidgin/pixmaps/emotes/default/24/scalable/musical-note.svg
        pidgin/pixmaps/emotes/default/24/scalable/phone.svg
        pidgin/pixmaps/emotes/default/24/scalable/pidgin-emotes.svg
        pidgin/pixmaps/emotes/default/24/scalable/pizza.svg
        pidgin/pixmaps/emotes/default/24/scalable/plate.svg
        pidgin/pixmaps/emotes/default/24/scalable/present.svg
        pidgin/pixmaps/emotes/default/24/scalable/rain.svg
        pidgin/pixmaps/emotes/default/24/scalable/rose-dead.svg
        pidgin/pixmaps/emotes/default/24/scalable/rose.svg
        pidgin/pixmaps/emotes/default/24/scalable/sheep.svg
        pidgin/pixmaps/emotes/default/24/scalable/snail.svg
        pidgin/pixmaps/emotes/default/24/scalable/soccerball.svg
        pidgin/pixmaps/emotes/default/24/scalable/star.svg
        pidgin/pixmaps/emotes/default/24/scalable/sun.svg
        pidgin/pixmaps/emotes/default/24/scalable/thunder.svg
        pidgin/pixmaps/emotes/default/24/scalable/turtle.svg
        pidgin/pixmaps/emotes/default/24/scalable/umbrella.svg

ChangeLog: 

merge of 'a3016031fd5b2669070b7d99b301874a29269f18'
     and 'a4c334b8d35bb414e74cc95f9ca21465182136de'