pidgin.vv: 6a12860d: explicit merge of '094ca19cc431d185c7b94...

maiku at soc.pidgin.im maiku at soc.pidgin.im
Sat Dec 13 05:40:55 EST 2008


-----------------------------------------------------------------
Revision: 6a12860d1ff4413ceb4ee4796d32912e52573269
Ancestor: 094ca19cc431d185c7b94947bfcd7cfc2d2f4a0b
Ancestor: a92ecd05b30230b85149a7c4edbcb269bc1c4841
Author: maiku at soc.pidgin.im
Date: 2008-12-13T08:48:58
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/6a12860d1ff4413ceb4ee4796d32912e52573269

Deleted entries:
        pidgin/pidginstock-artwork.c
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 ChangeLog Makefile.am configure.ac
        doc/TCL-HOWTO.dox doc/funniest_home_convos.txt
        finch/gntdebug.c finch/libgnt/gntentry.c libpurple/blist.c
        libpurple/dbus-analyze-functions.py libpurple/dnsquery.c
        libpurple/media.c libpurple/media.h libpurple/notify.h
        libpurple/plugins/log_reader.c
        libpurple/plugins/perl/common/Notify.xs
        libpurple/plugins/statenotify.c
        libpurple/plugins/tcl/tcl_cmd.c
        libpurple/protocols/bonjour/Makefile.am
        libpurple/protocols/gg/Makefile.am
        libpurple/protocols/gg/gg.c libpurple/protocols/gg/gg.h
        libpurple/protocols/irc/Makefile.am
        libpurple/protocols/irc/cmds.c
        libpurple/protocols/irc/dcc_send.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/Makefile.am
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/slpmsg.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/switchboard.h
        libpurple/protocols/msn/transaction.c
        libpurple/protocols/msnp9/Makefile.am
        libpurple/protocols/myspace/Makefile.am
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/novell/Makefile.am
        libpurple/protocols/null/Makefile.am
        libpurple/protocols/oscar/Makefile.am
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/group_opt.c
        libpurple/protocols/qq/qq.c libpurple/protocols/qq/qq_base.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/sametime/Makefile.am
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc/Makefile.am
        libpurple/protocols/silc10/Makefile.am
        libpurple/protocols/simple/Makefile.am
        libpurple/protocols/simple/simple.c
        libpurple/protocols/toc/Makefile.am
        libpurple/protocols/yahoo/Makefile.am
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/zephyr/Makefile.am
        libpurple/protocols/zephyr/zephyr.c libpurple/proxy.c
        libpurple/server.c libpurple/util.c libpurple/xmlnode.c
        pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkconv.c
        pidgin/gtknotify.c pidgin/gtkpounce.c pidgin/gtkprefs.c
        pidgin/gtksavedstatuses.c pidgin/pidginstock.c
        pidgin/pidginstock.h pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/emotes/default/24/Makefile.am
        pidgin/plugins/markerline.c pidgin/plugins/relnot.c
        pidgin/plugins/sendbutton.c 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: 

explicit merge of '094ca19cc431d185c7b94947bfcd7cfc2d2f4a0b'
              and 'a92ecd05b30230b85149a7c4edbcb269bc1c4841'



More information about the Commits mailing list