pidgin: 938ea04a: merge of '896a0f459df5db1110a59f355c4b24...

[kelemeng at gnome.hu]

-----------------------------------------------------------------
Revision: 938ea04a91dd07f6ad39d1303aeb8a85e5f2108f
Ancestor: 896a0f459df5db1110a59f355c4b243c3c4be58d
Ancestor: a4222a6a8081e1e41a29c5b01c09a31ed212eb60
Author: kelemeng at gnome.hu
Date: 2008-11-23T20:05:59
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/938ea04a91dd07f6ad39d1303aeb8a85e5f2108f

Added files:
        pidgin/pixmaps/emotes/small/16/Makefile.am
        pidgin/pixmaps/emotes/small/16/Makefile.mingw
        pidgin/pixmaps/emotes/small/16/TODO
        pidgin/pixmaps/emotes/small/16/angel.png
        pidgin/pixmaps/emotes/small/16/angry.png
        pidgin/pixmaps/emotes/small/16/beer.png
        pidgin/pixmaps/emotes/small/16/camera.png
        pidgin/pixmaps/emotes/small/16/cigarette.png
        pidgin/pixmaps/emotes/small/16/coffee.png
        pidgin/pixmaps/emotes/small/16/confused.png
        pidgin/pixmaps/emotes/small/16/console.png
        pidgin/pixmaps/emotes/small/16/cool.png
        pidgin/pixmaps/emotes/small/16/cross.png
        pidgin/pixmaps/emotes/small/16/crying.png
        pidgin/pixmaps/emotes/small/16/devil.png
        pidgin/pixmaps/emotes/small/16/dont-know.png
        pidgin/pixmaps/emotes/small/16/grin.png
        pidgin/pixmaps/emotes/small/16/hug-left.png
        pidgin/pixmaps/emotes/small/16/hug-right.png
        pidgin/pixmaps/emotes/small/16/kiss.png
        pidgin/pixmaps/emotes/small/16/love.png
        pidgin/pixmaps/emotes/small/16/meeting.png
        pidgin/pixmaps/emotes/small/16/musical-note.png
        pidgin/pixmaps/emotes/small/16/nerdy.png
        pidgin/pixmaps/emotes/small/16/neutral.png
        pidgin/pixmaps/emotes/small/16/party.png
        pidgin/pixmaps/emotes/small/16/phone.png
        pidgin/pixmaps/emotes/small/16/plate.png
        pidgin/pixmaps/emotes/small/16/question.png
        pidgin/pixmaps/emotes/small/16/sad.png
        pidgin/pixmaps/emotes/small/16/scalable/pidgin-emotes.svg
        pidgin/pixmaps/emotes/small/16/search.png
        pidgin/pixmaps/emotes/small/16/shame.png
        pidgin/pixmaps/emotes/small/16/shock.png
        pidgin/pixmaps/emotes/small/16/sick.png
        pidgin/pixmaps/emotes/small/16/silent.png
        pidgin/pixmaps/emotes/small/16/sleepy.png
        pidgin/pixmaps/emotes/small/16/small.theme.in
        pidgin/pixmaps/emotes/small/16/smile-big.png
        pidgin/pixmaps/emotes/small/16/smile.png
        pidgin/pixmaps/emotes/small/16/thinking.png
        pidgin/pixmaps/emotes/small/16/tongue.png
        pidgin/pixmaps/emotes/small/16/tv.png
        pidgin/pixmaps/emotes/small/16/uhm-yeah.png
        pidgin/pixmaps/emotes/small/16/wink.png
        pidgin/pixmaps/emotes/small/16/yawn.png
Added directories:
        pidgin/pixmaps/emotes/small pidgin/pixmaps/emotes/small/16
        pidgin/pixmaps/emotes/small/16/scalable
Modified files:
        .mtn-ignore COPYRIGHT Makefile.am configure.ac
        doc/funniest_home_convos.txt finch/gntdebug.c
        libpurple/dnsquery.c libpurple/notify.h
        libpurple/plugins/tcl/tcl_cmd.c libpurple/protocols/gg/gg.c
        libpurple/protocols/gg/gg.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/sametime/sametime.c libpurple/proxy.c
        pidgin/gtkblist.c pidgin/pidginstock.c
        pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/emotes/default/24/Makefile.am po/POTFILES.in
        po/hu.po
Modified attrs:
        pidgin/pixmaps/emotes/small/16/angel.png
        pidgin/pixmaps/emotes/small/16/angry.png
        pidgin/pixmaps/emotes/small/16/beer.png
        pidgin/pixmaps/emotes/small/16/camera.png
        pidgin/pixmaps/emotes/small/16/cigarette.png
        pidgin/pixmaps/emotes/small/16/coffee.png
        pidgin/pixmaps/emotes/small/16/confused.png
        pidgin/pixmaps/emotes/small/16/console.png
        pidgin/pixmaps/emotes/small/16/cool.png
        pidgin/pixmaps/emotes/small/16/cross.png
        pidgin/pixmaps/emotes/small/16/crying.png
        pidgin/pixmaps/emotes/small/16/devil.png
        pidgin/pixmaps/emotes/small/16/dont-know.png
        pidgin/pixmaps/emotes/small/16/grin.png
        pidgin/pixmaps/emotes/small/16/hug-left.png
        pidgin/pixmaps/emotes/small/16/hug-right.png
        pidgin/pixmaps/emotes/small/16/kiss.png
        pidgin/pixmaps/emotes/small/16/love.png
        pidgin/pixmaps/emotes/small/16/meeting.png
        pidgin/pixmaps/emotes/small/16/musical-note.png
        pidgin/pixmaps/emotes/small/16/nerdy.png
        pidgin/pixmaps/emotes/small/16/neutral.png
        pidgin/pixmaps/emotes/small/16/party.png
        pidgin/pixmaps/emotes/small/16/phone.png
        pidgin/pixmaps/emotes/small/16/plate.png
        pidgin/pixmaps/emotes/small/16/question.png
        pidgin/pixmaps/emotes/small/16/sad.png
        pidgin/pixmaps/emotes/small/16/search.png
        pidgin/pixmaps/emotes/small/16/shame.png
        pidgin/pixmaps/emotes/small/16/shock.png
        pidgin/pixmaps/emotes/small/16/sick.png
        pidgin/pixmaps/emotes/small/16/silent.png
        pidgin/pixmaps/emotes/small/16/sleepy.png
        pidgin/pixmaps/emotes/small/16/smile-big.png
        pidgin/pixmaps/emotes/small/16/smile.png
        pidgin/pixmaps/emotes/small/16/thinking.png
        pidgin/pixmaps/emotes/small/16/tongue.png
        pidgin/pixmaps/emotes/small/16/tv.png
        pidgin/pixmaps/emotes/small/16/uhm-yeah.png
        pidgin/pixmaps/emotes/small/16/wink.png
        pidgin/pixmaps/emotes/small/16/yawn.png

ChangeLog: 

merge of '896a0f459df5db1110a59f355c4b243c3c4be58d'
     and 'a4222a6a8081e1e41a29c5b01c09a31ed212eb60'