pidgin: b9bd0e2e: merge of '9ce1a7ac92f523b7b5b9983746ae57...

deryni at pidgin.im deryni at pidgin.im
Tue Sep 8 08:52:53 EDT 2009


-----------------------------------------------------------------
Revision: b9bd0e2e1abbd4a3fedf2ce2fddf4efc6e3b2a5c
Ancestor: 9ce1a7ac92f523b7b5b9983746ae57ee1fac1a67
Ancestor: ebf771e2c74addf4821a643a9c9179f4adc67c3b
Author: deryni at pidgin.im
Date: 2009-09-08T02:23:49
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b9bd0e2e1abbd4a3fedf2ce2fddf4efc6e3b2a5c

Renamed entries:
        pidgin/pixmaps/toolbar/22/scalable/voice-call.svg to pidgin/pixmaps/toolbar/22/scalable/audio-call.svg
        pidgin/pixmaps/toolbar/22/voice-call.png to pidgin/pixmaps/toolbar/22/audio-call.png
        pidgin/pixmaps/toolbar/32/scalable/voice-call.svg to pidgin/pixmaps/toolbar/32/scalable/audio-call.svg
        pidgin/pixmaps/toolbar/32/voice-call.png to pidgin/pixmaps/toolbar/32/audio-call.png
        pidgin/pixmaps/toolbar/48/scalable/voice-call.svg to pidgin/pixmaps/toolbar/48/scalable/audio-call.svg
        pidgin/pixmaps/toolbar/48/voice-call.png to pidgin/pixmaps/toolbar/48/audio-call.png
Added files:
        libpurple/tests/test_qq.c pidgin/plugins/vvconfig.c
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
        Makefile.am NEWS PLUGIN_HOWTO autogen.sh configure.ac
        finch/Makefile.am finch/gntmedia.c finch/libgnt/configure.ac
        finch/libgnt/gntmain.c finch/plugins/gnttinyurl.c
        finch/plugins/grouping.c libpurple/Makefile.am
        libpurple/account.c libpurple/account.h libpurple/blist.c
        libpurple/blist.h libpurple/certificate.c
        libpurple/conversation.h libpurple/core.c libpurple/core.h
        libpurple/dbus-analyze-functions.py libpurple/dnssrv.c
        libpurple/dnssrv.h libpurple/example/Makefile.am
        libpurple/ft.c libpurple/idle.h libpurple/media-gst.h
        libpurple/media.c libpurple/media.h libpurple/mediamanager.c
        libpurple/mediamanager.h libpurple/plugins/joinpart.c
        libpurple/plugins/perl/common/XMLNode.xs
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/bonjour_ft.h
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/adhoccommands.h
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/auth.h
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/bosh.h
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/caps.h
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/disco.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/iq.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/content.c
        libpurple/protocols/jabber/jingle/content.h
        libpurple/protocols/jabber/jingle/iceudp.c
        libpurple/protocols/jabber/jingle/iceudp.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jingle/rawudp.c
        libpurple/protocols/jabber/jingle/rawudp.h
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/jingle/rtp.h
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/jingle/session.h
        libpurple/protocols/jabber/jingle/transport.c
        libpurple/protocols/jabber/jingle/transport.h
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/message.h
        libpurple/protocols/jabber/oob.c
        libpurple/protocols/jabber/oob.h
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/parser.h
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/pep.h
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/jabber/ping.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/presence.h
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/roster.h
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/si.h
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/jabber/useravatar.h
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/jabber/usermood.h
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/usernick.h
        libpurple/protocols/jabber/usertune.c
        libpurple/protocols/jabber/usertune.h
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/jabber/xdata.h
        libpurple/protocols/msn/cmdproc.h
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/error.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c libpurple/protocols/msn/oim.h
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/soap.h
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msnp9/slp.c
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_buddy.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/snactypes.h
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/file_trans.c
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/qq_base.c
        libpurple/protocols/qq/qq_crypt.c
        libpurple/protocols/qq/qq_crypt.h
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/simple/Makefile.am
        libpurple/protocols/yahoo/libyahoo.c
        libpurple/protocols/yahoo/libyahoojp.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/util.c libpurple/proxy.c
        libpurple/server.c libpurple/smiley.c libpurple/smiley.h
        libpurple/status.h libpurple/tests/Makefile.am
        libpurple/tests/check_libpurple.c
        libpurple/tests/test_jabber_jutil.c
        libpurple/tests/test_yahoo_util.c libpurple/tests/tests.h
        libpurple/theme-loader.c libpurple/theme-loader.h
        libpurple/theme.c libpurple/theme.h libpurple/util.c
        libpurple/util.h pidgin/Makefile.am pidgin/gtkblist-theme.c
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdialogs.c
        pidgin/gtkimhtml.h pidgin/gtkimhtmltoolbar.c
        pidgin/gtkmain.c pidgin/gtkmedia.c pidgin/gtkmedia.h
        pidgin/gtknotify.c pidgin/gtkprefs.c pidgin/gtksmiley.c
        pidgin/gtkutils.c pidgin/pidginstock.c
        pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/emotes/default/24/default.theme.in
        pidgin/pixmaps/emotes/small/16/small.theme.in
        pidgin/pixmaps/status/11/invisible.png
        pidgin/plugins/Makefile.am pidgin/plugins/disco/Makefile.am
        pidgin/plugins/disco/gtkdisco.c
        pidgin/plugins/gestures/stroke.c
        pidgin/plugins/gevolution/eds-utils.c
        pidgin/plugins/gevolution/gevo-util.c
        pidgin/win32/nsis/pidgin-installer.nsi pidgin.spec.in
        po/ChangeLog po/POTFILES.in po/af.po po/bn.po po/check_po.pl
        po/cs.po po/de.po po/el.po po/eo.po po/es.po po/eu.po
        po/fi.po po/fr.po po/he.po po/hu.po po/it.po po/lt.po
        po/mn.po po/pt_BR.po po/ro.po po/sk.po po/sl.po po/sq.po
        po/sv.po po/zh_CN.po po/zh_HK.po po/zh_TW.po

ChangeLog: 

merge of '9ce1a7ac92f523b7b5b9983746ae57ee1fac1a67'
     and 'ebf771e2c74addf4821a643a9c9179f4adc67c3b'



More information about the Commits mailing list