cpw.qulogic.msnp16: 9e76c8a2: merge of '029197c93909a808e78b66053bb411...

masca at cpw.pidgin.im masca at cpw.pidgin.im
Tue Mar 9 19:01:09 EST 2010 

-----------------------------------------------------------------
Revision: 9e76c8a2e0e342f636d1412d55c5b7c0af3d3b9c
Ancestor: 029197c93909a808e78b66053bb4115e20435b72
Ancestor: b54865ce382025afc60662f3a873e6ebfd175f36
Author: masca at cpw.pidgin.im
Date: 2010-02-24T17:36:45
Branch: im.pidgin.cpw.qulogic.msnp16
URL: http://d.pidgin.im/viewmtn/revision/info/9e76c8a2e0e342f636d1412d55c5b7c0af3d3b9c

Deleted entries:
        pidgin/gtkdocklet-x11.c
Renamed entries:
        pidgin/pixmaps/emblems/16/mobile.png to pidgin/pixmaps/emotes/small/16/mobile.png
        pidgin/pixmaps/emblems/16/music.png to pidgin/pixmaps/emotes/small/16/music.png
        pidgin/pixmaps/emblems/scalable/mobile.svg to pidgin/pixmaps/emotes/small/16/scalable/mobile.svg
        pidgin/pixmaps/emblems/scalable/music.svg to pidgin/pixmaps/emotes/small/16/scalable/music.svg
        pidgin/pixmaps/emotes/default/24/eat.png to pidgin/pixmaps/emotes/default/24/hungry.png
        pidgin/pixmaps/emotes/default/24/in-love.png to pidgin/pixmaps/emotes/default/24/amorous.png
        pidgin/pixmaps/emotes/default/24/love.png to pidgin/pixmaps/emotes/default/24/in_love.png
        pidgin/pixmaps/emotes/default/24/nailbiting.png to pidgin/pixmaps/emotes/default/24/nervous.png
        pidgin/pixmaps/emotes/default/24/shock.png to pidgin/pixmaps/emotes/default/24/shocked.png
        pidgin/pixmaps/emotes/default/24/sleepy.png to pidgin/pixmaps/emotes/default/24/sleeping.png
        pidgin/pixmaps/emotes/default/24/smile-big.png to pidgin/pixmaps/emotes/default/24/excited.png
        pidgin/pixmaps/emotes/default/24/smile.png to pidgin/pixmaps/emotes/default/24/happy.png
        pidgin/pixmaps/emotes/default/24/sweat.png to pidgin/pixmaps/emotes/default/24/hot.png
        pidgin/pixmaps/emotes/default/24/tremble.png to pidgin/pixmaps/emotes/default/24/afraid.png
        pidgin/pixmaps/emotes/default/24/yawn.png to pidgin/pixmaps/emotes/default/24/sleepy.png
        pidgin/pixmaps/emotes/small/16/love.png to pidgin/pixmaps/emotes/small/16/in_love.png
        pidgin/pixmaps/emotes/small/16/shock.png to pidgin/pixmaps/emotes/small/16/shocked.png
        pidgin/pixmaps/emotes/small/16/sleepy.png to pidgin/pixmaps/emotes/small/16/sleeping.png
        pidgin/pixmaps/emotes/small/16/smile-big.png to pidgin/pixmaps/emotes/small/16/excited.png
        pidgin/pixmaps/emotes/small/16/smile.png to pidgin/pixmaps/emotes/small/16/happy.png
        pidgin/pixmaps/emotes/small/16/yawn.png to pidgin/pixmaps/emotes/small/16/sleepy.png
Added files:
        pidgin/pixmaps/emotes/small/16/afraid.png
        pidgin/pixmaps/emotes/small/16/amorous.png
        pidgin/pixmaps/emotes/small/16/bathing.png
        pidgin/pixmaps/emotes/small/16/cinema.png
        pidgin/pixmaps/emotes/small/16/disappointed.png
        pidgin/pixmaps/emotes/small/16/embarrassed.png
        pidgin/pixmaps/emotes/small/16/hot.png
        pidgin/pixmaps/emotes/small/16/hungry.png
        pidgin/pixmaps/emotes/small/16/internet.png
        pidgin/pixmaps/emotes/small/16/mean.png
        pidgin/pixmaps/emotes/small/16/nervous.png
        pidgin/pixmaps/emotes/small/16/restroom.png
        pidgin/pixmaps/emotes/small/16/sarcastic.png
        pidgin/pixmaps/emotes/small/16/shopping.png
        pidgin/pixmaps/emotes/small/16/studying.png
        pidgin/pixmaps/emotes/small/16/suit.png
        pidgin/pixmaps/emotes/small/16/surfing.png
        pidgin/pixmaps/emotes/small/16/typing.png
        pidgin/pixmaps/emotes/small/16/working.png
        pidgin/pixmaps/emotes/small/16/writing.png
Modified files:
        COPYRIGHT ChangeLog.API finch/gntplugin.c finch/gntprefs.c
        finch/plugins/gnthistory.c libpurple/Makefile.mingw
        libpurple/account.c libpurple/plugins/log_reader.c
        libpurple/plugins/perl/common/Request.xs
        libpurple/plugins/perl/scripts/signals-test.pl
        libpurple/protocols/bonjour/Makefile.mingw
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/gg/gg.c libpurple/protocols/irc/irc.c
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/jabber/usermood.h
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/msn/dialog.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/msnutils.h
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/family_buddy.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/oscarcommon.h
        libpurple/protocols/oscar/tlv.c libpurple/protocols/qq/qq.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc/buddy.c
        libpurple/protocols/silc/chat.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/buddy.c
        libpurple/protocols/silc10/chat.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/libyahoo.c
        libpurple/protocols/yahoo/libyahoojp.c
        libpurple/protocols/zephyr/zephyr.c libpurple/prpl.h
        libpurple/request.c libpurple/request.h libpurple/status.c
        libpurple/status.h libpurple/win32/global.mak
        libpurple/win32/libc_interface.c
        libpurple/win32/libc_interface.h
        libpurple/win32/libpurplerc.rc.in pidgin/Makefile.am
        pidgin/gtkblist.c pidgin/gtkblist.h pidgin/gtkdebug.c
        pidgin/gtkdocklet-gtk.c pidgin/gtkprefs.c
        pidgin/gtkprivacy.c pidgin/gtkrequest.c
        pidgin/gtksavedstatuses.c pidgin/gtkutils.c
        pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/emotes/default/24/Makefile.am
        pidgin/pixmaps/emotes/default/24/default.theme.in
        pidgin/pixmaps/emotes/small/16/Makefile.am
        pidgin/pixmaps/emotes/small/16/TODO
        pidgin/pixmaps/emotes/small/16/small.theme.in
        pidgin/plugins/gestures/gestures.c
        pidgin/plugins/gevolution/assoc-buddy.c
        pidgin/plugins/win32/transparency/win2ktrans.c
        pidgin/win32/gtkwin32dep.c pidgin/win32/pidgin_dll_rc.rc.in
        pidgin/win32/pidgin_exe_rc.rc.in po/POTFILES.in
Modified attrs:
        pidgin/pixmaps/emotes/small/16/afraid.png
        pidgin/pixmaps/emotes/small/16/amorous.png
        pidgin/pixmaps/emotes/small/16/bathing.png
        pidgin/pixmaps/emotes/small/16/cinema.png
        pidgin/pixmaps/emotes/small/16/disappointed.png
        pidgin/pixmaps/emotes/small/16/embarrassed.png
        pidgin/pixmaps/emotes/small/16/hot.png
        pidgin/pixmaps/emotes/small/16/hungry.png
        pidgin/pixmaps/emotes/small/16/internet.png
        pidgin/pixmaps/emotes/small/16/mean.png
        pidgin/pixmaps/emotes/small/16/nervous.png
        pidgin/pixmaps/emotes/small/16/restroom.png
        pidgin/pixmaps/emotes/small/16/sarcastic.png
        pidgin/pixmaps/emotes/small/16/shopping.png
        pidgin/pixmaps/emotes/small/16/studying.png
        pidgin/pixmaps/emotes/small/16/suit.png
        pidgin/pixmaps/emotes/small/16/surfing.png
        pidgin/pixmaps/emotes/small/16/typing.png
        pidgin/pixmaps/emotes/small/16/working.png
        pidgin/pixmaps/emotes/small/16/writing.png

ChangeLog: 

merge of '029197c93909a808e78b66053bb4115e20435b72'
     and 'b54865ce382025afc60662f3a873e6ebfd175f36'

More information about the Commits mailing list