pidgin: 3b1faad4: merge of '2c429e7e623da14e68de42a0319091...

deryni at pidgin.im deryni at pidgin.im
Tue Jul 21 22:40:57 EDT 2009


-----------------------------------------------------------------
Revision: 3b1faad42b89245e12673c727b8f0c237e96c798
Ancestor: 2c429e7e623da14e68de42a031909190e1f9dbac
Ancestor: 481dcc62a70f66aaa407732e9195d711b6d6b17c
Author: deryni at pidgin.im
Date: 2009-07-22T02:36:28
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3b1faad42b89245e12673c727b8f0c237e96c798

Deleted entries:
        pidgin/pixmaps/icons/hicolor/48x48/apps/scalable
Renamed entries:
        pidgin/pixmaps/dialogs/64/scalable to pidgin/pixmaps/dialogs/scalable
        pidgin/pixmaps/emblems/16/scalable to pidgin/pixmaps/emblems/scalable
        pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg to pidgin/pixmaps/icons/hicolor/scalable/apps/pidgin.svg
        pidgin/pixmaps/logo.png to pidgin/pixmaps/logo-nonvv.png
        pidgin/pixmaps/protocols/48/scalable to pidgin/pixmaps/protocols/scalable
Added files:
        pidgin/pixmaps/logo.png pidgin/pixmaps/logo.svg
        pidgin/pixmaps/status/svg/status.svg
        pidgin/pixmaps/toolbar/22/scalable/video-call.svg
        pidgin/pixmaps/toolbar/22/scalable/voice-call.svg
        pidgin/pixmaps/toolbar/22/video-call.png
        pidgin/pixmaps/toolbar/22/voice-call.png
        pidgin/pixmaps/toolbar/32/scalable/video-call.svg
        pidgin/pixmaps/toolbar/32/scalable/voice-call.svg
        pidgin/pixmaps/toolbar/32/video-call.png
        pidgin/pixmaps/toolbar/32/voice-call.png
        pidgin/pixmaps/toolbar/48/scalable/video-call.svg
        pidgin/pixmaps/toolbar/48/scalable/voice-call.svg
        pidgin/pixmaps/toolbar/48/video-call.png
        pidgin/pixmaps/toolbar/48/voice-call.png
        share/ca-certs/Equifax_Secure_Global_eBusiness_CA-1.pem
        share/ca-certs/VeriSign_Class3_Extended_Validation_CA.pem
        share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem
Added directories:
        pidgin/pixmaps/icons/hicolor/scalable
        pidgin/pixmaps/icons/hicolor/scalable/apps
        pidgin/pixmaps/toolbar/32 pidgin/pixmaps/toolbar/32/scalable
        pidgin/pixmaps/toolbar/48 pidgin/pixmaps/toolbar/48/scalable
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API configure.ac finch/finch.c
        finch/finch.h finch/gntaccount.c finch/gntblist.c
        finch/gntcertmgr.c finch/gntconn.c finch/gntconv.c
        finch/gntdebug.c finch/gntft.c finch/gntlog.c
        finch/gntmedia.c finch/gntnotify.c finch/gntplugin.c
        finch/gntpounce.c finch/gntprefs.c finch/gntrequest.c
        finch/gntroomlist.c finch/gntsound.c finch/gntstatus.c
        finch/gntui.c finch/plugins/Makefile.am
        libpurple/Makefile.am libpurple/blist.c libpurple/blist.h
        libpurple/buddyicon.c libpurple/certificate.c
        libpurple/dnsquery.c libpurple/dnssrv.c libpurple/internal.h
        libpurple/network.c libpurple/network.h libpurple/plugin.c
        libpurple/plugins/Makefile.am
        libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/plugins/ssl/ssl-nss.c libpurple/prefs.h
        libpurple/privacy.h libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/message.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/presence.h
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/msnutils.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slpmsg.c
        libpurple/protocols/msn/slpmsg.h
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msnp9/command.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/oscar/util.c
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/yahoo/Makefile.am
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_aliases.h
        libpurple/protocols/yahoo/yahoo_doodle.c
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_friend.h
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/protocols/yahoo/yahoo_packet.h
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoochat.c libpurple/prpl.c
        libpurple/server.c libpurple/sslconn.c libpurple/sslconn.h
        libpurple/status.c libpurple/tests/test_jabber_jutil.c
        libpurple/tests/test_util.c libpurple/util.c
        libpurple/util.h libpurple/win32/libc_internal.h
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdialogs.c
        pidgin/gtkmain.c pidgin/gtkrequest.c pidgin/gtkutils.c
        pidgin/pidginstock.c pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/status/16/available.png
        pidgin/pixmaps/status/16/away.png
        pidgin/pixmaps/status/16/busy.png
        pidgin/pixmaps/status/16/offline.png
        pidgin/pixmaps/status/22/available.png
        pidgin/pixmaps/status/22/away.png
        pidgin/pixmaps/status/22/busy.png
        pidgin/pixmaps/status/22/offline.png
        pidgin/pixmaps/status/32/available.png
        pidgin/pixmaps/status/32/away.png
        pidgin/pixmaps/status/32/busy.png
        pidgin/pixmaps/status/32/offline.png
        pidgin/pixmaps/status/48/available.png
        pidgin/pixmaps/status/48/away.png
        pidgin/pixmaps/status/48/busy.png
        pidgin/pixmaps/status/48/offline.png
        pidgin/plugins/Makefile.am pidgin/plugins/disco/gtkdisco.c
        pidgin/plugins/disco/xmppdisco.c
        pidgin/plugins/gevolution/add_buddy_dialog.c
        pidgin/plugins/gevolution/assoc-buddy.c
        pidgin/plugins/gevolution/eds-utils.c
        pidgin/plugins/gevolution/gevo-util.c
        pidgin/plugins/gevolution/gevolution.c
        pidgin/plugins/notify.c
        pidgin/win32/nsis/pidgin-installer.nsi pidgin.desktop.in
        pidgin.spec.in po/ChangeLog po/POTFILES.in po/de.po po/el.po
        po/fi.po po/fr.po po/gl.po po/km.po po/nl.po po/nn.po
        po/pa.po po/pt_BR.po po/ru.po po/sv.po
        share/ca-certs/Makefile.am
Modified attrs:
        pidgin/pixmaps/logo.png
        pidgin/pixmaps/toolbar/22/video-call.png
        pidgin/pixmaps/toolbar/22/voice-call.png
        pidgin/pixmaps/toolbar/32/video-call.png
        pidgin/pixmaps/toolbar/32/voice-call.png
        pidgin/pixmaps/toolbar/48/video-call.png
        pidgin/pixmaps/toolbar/48/voice-call.png

ChangeLog: 

merge of '2c429e7e623da14e68de42a031909190e1f9dbac'
     and '481dcc62a70f66aaa407732e9195d711b6d6b17c'



More information about the Commits mailing list