pidgin: e1e9bf66: merge of 'd50e4b01c210ebbcd8f8d5a001fa72...

qulogic at pidgin.im qulogic at pidgin.im
Tue Sep 23 01:36:13 EDT 2008


-----------------------------------------------------------------
Revision: e1e9bf66d0fd0c83e28c2fc6c3795595f7297f29
Ancestor: d50e4b01c210ebbcd8f8d5a001fa72450e021a97
Ancestor: e550112b97817b0eafc647bd8c0adddf2a262a62
Author: qulogic at pidgin.im
Date: 2008-09-17T00:30:18
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e1e9bf66d0fd0c83e28c2fc6c3795595f7297f29

Deleted entries:
        pidgin/pixmaps/buddy_icons pidgin/pixmaps/buddy_icons/qq
        pidgin/pixmaps/buddy_icons/qq/Makefile.am
        pidgin/pixmaps/buddy_icons/qq/Makefile.mingw
        pidgin/pixmaps/buddy_icons/qq/qq_1.png
        pidgin/pixmaps/buddy_icons/qq/qq_10.png
        pidgin/pixmaps/buddy_icons/qq/qq_100.png
        pidgin/pixmaps/buddy_icons/qq/qq_11.png
        pidgin/pixmaps/buddy_icons/qq/qq_12.png
        pidgin/pixmaps/buddy_icons/qq/qq_13.png
        pidgin/pixmaps/buddy_icons/qq/qq_14.png
        pidgin/pixmaps/buddy_icons/qq/qq_15.png
        pidgin/pixmaps/buddy_icons/qq/qq_16.png
        pidgin/pixmaps/buddy_icons/qq/qq_17.png
        pidgin/pixmaps/buddy_icons/qq/qq_18.png
        pidgin/pixmaps/buddy_icons/qq/qq_19.png
        pidgin/pixmaps/buddy_icons/qq/qq_2.png
        pidgin/pixmaps/buddy_icons/qq/qq_20.png
        pidgin/pixmaps/buddy_icons/qq/qq_21.png
        pidgin/pixmaps/buddy_icons/qq/qq_22.png
        pidgin/pixmaps/buddy_icons/qq/qq_23.png
        pidgin/pixmaps/buddy_icons/qq/qq_24.png
        pidgin/pixmaps/buddy_icons/qq/qq_25.png
        pidgin/pixmaps/buddy_icons/qq/qq_26.png
        pidgin/pixmaps/buddy_icons/qq/qq_27.png
        pidgin/pixmaps/buddy_icons/qq/qq_28.png
        pidgin/pixmaps/buddy_icons/qq/qq_29.png
        pidgin/pixmaps/buddy_icons/qq/qq_3.png
        pidgin/pixmaps/buddy_icons/qq/qq_30.png
        pidgin/pixmaps/buddy_icons/qq/qq_31.png
        pidgin/pixmaps/buddy_icons/qq/qq_32.png
        pidgin/pixmaps/buddy_icons/qq/qq_33.png
        pidgin/pixmaps/buddy_icons/qq/qq_34.png
        pidgin/pixmaps/buddy_icons/qq/qq_35.png
        pidgin/pixmaps/buddy_icons/qq/qq_36.png
        pidgin/pixmaps/buddy_icons/qq/qq_37.png
        pidgin/pixmaps/buddy_icons/qq/qq_38.png
        pidgin/pixmaps/buddy_icons/qq/qq_39.png
        pidgin/pixmaps/buddy_icons/qq/qq_4.png
        pidgin/pixmaps/buddy_icons/qq/qq_40.png
        pidgin/pixmaps/buddy_icons/qq/qq_41.png
        pidgin/pixmaps/buddy_icons/qq/qq_42.png
        pidgin/pixmaps/buddy_icons/qq/qq_43.png
        pidgin/pixmaps/buddy_icons/qq/qq_44.png
        pidgin/pixmaps/buddy_icons/qq/qq_45.png
        pidgin/pixmaps/buddy_icons/qq/qq_46.png
        pidgin/pixmaps/buddy_icons/qq/qq_47.png
        pidgin/pixmaps/buddy_icons/qq/qq_48.png
        pidgin/pixmaps/buddy_icons/qq/qq_49.png
        pidgin/pixmaps/buddy_icons/qq/qq_5.png
        pidgin/pixmaps/buddy_icons/qq/qq_50.png
        pidgin/pixmaps/buddy_icons/qq/qq_51.png
        pidgin/pixmaps/buddy_icons/qq/qq_52.png
        pidgin/pixmaps/buddy_icons/qq/qq_53.png
        pidgin/pixmaps/buddy_icons/qq/qq_54.png
        pidgin/pixmaps/buddy_icons/qq/qq_55.png
        pidgin/pixmaps/buddy_icons/qq/qq_56.png
        pidgin/pixmaps/buddy_icons/qq/qq_57.png
        pidgin/pixmaps/buddy_icons/qq/qq_58.png
        pidgin/pixmaps/buddy_icons/qq/qq_59.png
        pidgin/pixmaps/buddy_icons/qq/qq_6.png
        pidgin/pixmaps/buddy_icons/qq/qq_60.png
        pidgin/pixmaps/buddy_icons/qq/qq_61.png
        pidgin/pixmaps/buddy_icons/qq/qq_62.png
        pidgin/pixmaps/buddy_icons/qq/qq_63.png
        pidgin/pixmaps/buddy_icons/qq/qq_64.png
        pidgin/pixmaps/buddy_icons/qq/qq_65.png
        pidgin/pixmaps/buddy_icons/qq/qq_66.png
        pidgin/pixmaps/buddy_icons/qq/qq_67.png
        pidgin/pixmaps/buddy_icons/qq/qq_68.png
        pidgin/pixmaps/buddy_icons/qq/qq_69.png
        pidgin/pixmaps/buddy_icons/qq/qq_7.png
        pidgin/pixmaps/buddy_icons/qq/qq_70.png
        pidgin/pixmaps/buddy_icons/qq/qq_71.png
        pidgin/pixmaps/buddy_icons/qq/qq_72.png
        pidgin/pixmaps/buddy_icons/qq/qq_73.png
        pidgin/pixmaps/buddy_icons/qq/qq_74.png
        pidgin/pixmaps/buddy_icons/qq/qq_75.png
        pidgin/pixmaps/buddy_icons/qq/qq_76.png
        pidgin/pixmaps/buddy_icons/qq/qq_77.png
        pidgin/pixmaps/buddy_icons/qq/qq_78.png
        pidgin/pixmaps/buddy_icons/qq/qq_79.png
        pidgin/pixmaps/buddy_icons/qq/qq_8.png
        pidgin/pixmaps/buddy_icons/qq/qq_80.png
        pidgin/pixmaps/buddy_icons/qq/qq_81.png
        pidgin/pixmaps/buddy_icons/qq/qq_82.png
        pidgin/pixmaps/buddy_icons/qq/qq_83.png
        pidgin/pixmaps/buddy_icons/qq/qq_84.png
        pidgin/pixmaps/buddy_icons/qq/qq_85.png
        pidgin/pixmaps/buddy_icons/qq/qq_86.png
        pidgin/pixmaps/buddy_icons/qq/qq_87.png
        pidgin/pixmaps/buddy_icons/qq/qq_88.png
        pidgin/pixmaps/buddy_icons/qq/qq_89.png
        pidgin/pixmaps/buddy_icons/qq/qq_9.png
        pidgin/pixmaps/buddy_icons/qq/qq_90.png
        pidgin/pixmaps/buddy_icons/qq/qq_91.png
        pidgin/pixmaps/buddy_icons/qq/qq_92.png
        pidgin/pixmaps/buddy_icons/qq/qq_93.png
        pidgin/pixmaps/buddy_icons/qq/qq_94.png
        pidgin/pixmaps/buddy_icons/qq/qq_95.png
        pidgin/pixmaps/buddy_icons/qq/qq_96.png
        pidgin/pixmaps/buddy_icons/qq/qq_97.png
        pidgin/pixmaps/buddy_icons/qq/qq_98.png
        pidgin/pixmaps/buddy_icons/qq/qq_99.png
        pidgin/pixmaps/emotes/default/24/scalable/act-up.svg
        pidgin/pixmaps/emotes/default/24/scalable/alien.svg
        pidgin/pixmaps/emotes/default/24/scalable/angel.svg
        pidgin/pixmaps/emotes/default/24/scalable/angry.svg
        pidgin/pixmaps/emotes/default/24/scalable/arrogant.svg
        pidgin/pixmaps/emotes/default/24/scalable/at-wits-end.svg
        pidgin/pixmaps/emotes/default/24/scalable/bashful.svg
        pidgin/pixmaps/emotes/default/24/scalable/beat-up.svg
        pidgin/pixmaps/emotes/default/24/scalable/beauty.svg
        pidgin/pixmaps/emotes/default/24/scalable/blowkiss.svg
        pidgin/pixmaps/emotes/default/24/scalable/bulgy-eyes.svg
        pidgin/pixmaps/emotes/default/24/scalable/bye.svg
        pidgin/pixmaps/emotes/default/24/scalable/call-me.svg
        pidgin/pixmaps/emotes/default/24/scalable/clap.svg
        pidgin/pixmaps/emotes/default/24/scalable/confused.svg
        pidgin/pixmaps/emotes/default/24/scalable/cowboy.svg
        pidgin/pixmaps/emotes/default/24/scalable/crying.svg
        pidgin/pixmaps/emotes/default/24/scalable/curl-lip.svg
        pidgin/pixmaps/emotes/default/24/scalable/curse.svg
        pidgin/pixmaps/emotes/default/24/scalable/cute.svg
        pidgin/pixmaps/emotes/default/24/scalable/cyclops.svg
        pidgin/pixmaps/emotes/default/24/scalable/dance.svg
        pidgin/pixmaps/emotes/default/24/scalable/desire.svg
        pidgin/pixmaps/emotes/default/24/scalable/devil.svg
        pidgin/pixmaps/emotes/default/24/scalable/disappointed.svg
        pidgin/pixmaps/emotes/default/24/scalable/disdain.svg
        pidgin/pixmaps/emotes/default/24/scalable/doctor.svg
        pidgin/pixmaps/emotes/default/24/scalable/doh.svg
        pidgin/pixmaps/emotes/default/24/scalable/dont-know.svg
        pidgin/pixmaps/emotes/default/24/scalable/drool.svg
        pidgin/pixmaps/emotes/default/24/scalable/eat.svg
        pidgin/pixmaps/emotes/default/24/scalable/embarrassed.svg
        pidgin/pixmaps/emotes/default/24/scalable/excruciating.svg
        pidgin/pixmaps/emotes/default/24/scalable/eyeroll.svg
        pidgin/pixmaps/emotes/default/24/scalable/female-fighter.svg
        pidgin/pixmaps/emotes/default/24/scalable/fingers-crossed.svg
        pidgin/pixmaps/emotes/default/24/scalable/foot-in-mouth.svg
        pidgin/pixmaps/emotes/default/24/scalable/freaked-out.svg
        pidgin/pixmaps/emotes/default/24/scalable/giggle.svg
        pidgin/pixmaps/emotes/default/24/scalable/glasses-cool.svg
        pidgin/pixmaps/emotes/default/24/scalable/glasses-nerdy.svg
        pidgin/pixmaps/emotes/default/24/scalable/go-away.svg
        pidgin/pixmaps/emotes/default/24/scalable/handshake.svg
        pidgin/pixmaps/emotes/default/24/scalable/highfive.svg
        pidgin/pixmaps/emotes/default/24/scalable/hug-left.svg
        pidgin/pixmaps/emotes/default/24/scalable/hug-right.svg
        pidgin/pixmaps/emotes/default/24/scalable/hypnotized.svg
        pidgin/pixmaps/emotes/default/24/scalable/in-love.svg
        pidgin/pixmaps/emotes/default/24/scalable/jump.svg
        pidgin/pixmaps/emotes/default/24/scalable/kiss.svg
        pidgin/pixmaps/emotes/default/24/scalable/kissed.svg
        pidgin/pixmaps/emotes/default/24/scalable/kissing.svg
        pidgin/pixmaps/emotes/default/24/scalable/lashes.svg
        pidgin/pixmaps/emotes/default/24/scalable/laugh.svg
        pidgin/pixmaps/emotes/default/24/scalable/lying.svg
        pidgin/pixmaps/emotes/default/24/scalable/madtongue.svg
        pidgin/pixmaps/emotes/default/24/scalable/male-fighter2.svg
        pidgin/pixmaps/emotes/default/24/scalable/mean.svg
        pidgin/pixmaps/emotes/default/24/scalable/meeting.svg
        pidgin/pixmaps/emotes/default/24/scalable/messed.svg
        pidgin/pixmaps/emotes/default/24/scalable/mohawk.svg
        pidgin/pixmaps/emotes/default/24/scalable/moneymouth.svg
        pidgin/pixmaps/emotes/default/24/scalable/music.svg
        pidgin/pixmaps/emotes/default/24/scalable/nailbiting.svg
        pidgin/pixmaps/emotes/default/24/scalable/neutral.svg
        pidgin/pixmaps/emotes/default/24/scalable/on-the-phone.svg
        pidgin/pixmaps/emotes/default/24/scalable/party.svg
        pidgin/pixmaps/emotes/default/24/scalable/pirate.svg
        pidgin/pixmaps/emotes/default/24/scalable/pissed-off.svg
        pidgin/pixmaps/emotes/default/24/scalable/pray.svg
        pidgin/pixmaps/emotes/default/24/scalable/question.svg
        pidgin/pixmaps/emotes/default/24/scalable/quiet.svg
        pidgin/pixmaps/emotes/default/24/scalable/rotfl.svg
        pidgin/pixmaps/emotes/default/24/scalable/sad.svg
        pidgin/pixmaps/emotes/default/24/scalable/sarcastic.svg
        pidgin/pixmaps/emotes/default/24/scalable/secret.svg
        pidgin/pixmaps/emotes/default/24/scalable/shame.svg
        pidgin/pixmaps/emotes/default/24/scalable/shock.svg
        pidgin/pixmaps/emotes/default/24/scalable/shut-mouth.svg
        pidgin/pixmaps/emotes/default/24/scalable/sick.svg
        pidgin/pixmaps/emotes/default/24/scalable/sidefrown.svg
        pidgin/pixmaps/emotes/default/24/scalable/silly.svg
        pidgin/pixmaps/emotes/default/24/scalable/sinister.svg
        pidgin/pixmaps/emotes/default/24/scalable/skywalker.svg
        pidgin/pixmaps/emotes/default/24/scalable/sleepy.svg
        pidgin/pixmaps/emotes/default/24/scalable/smile-big.svg
        pidgin/pixmaps/emotes/default/24/scalable/smile.svg
        pidgin/pixmaps/emotes/default/24/scalable/smirk.svg
        pidgin/pixmaps/emotes/default/24/scalable/soldier.svg
        pidgin/pixmaps/emotes/default/24/scalable/starving.svg
        pidgin/pixmaps/emotes/default/24/scalable/stop.svg
        pidgin/pixmaps/emotes/default/24/scalable/struggle.svg
        pidgin/pixmaps/emotes/default/24/scalable/sweat.svg
        pidgin/pixmaps/emotes/default/24/scalable/talktohand.svg
        pidgin/pixmaps/emotes/default/24/scalable/terror.svg
        pidgin/pixmaps/emotes/default/24/scalable/thinking.svg
        pidgin/pixmaps/emotes/default/24/scalable/time-out.svg
        pidgin/pixmaps/emotes/default/24/scalable/tongue.svg
        pidgin/pixmaps/emotes/default/24/scalable/tremble.svg
        pidgin/pixmaps/emotes/default/24/scalable/vampire.svg
        pidgin/pixmaps/emotes/default/24/scalable/victory.svg
        pidgin/pixmaps/emotes/default/24/scalable/waiting.svg
        pidgin/pixmaps/emotes/default/24/scalable/waving.svg
        pidgin/pixmaps/emotes/default/24/scalable/weep.svg
        pidgin/pixmaps/emotes/default/24/scalable/wilt.svg
        pidgin/pixmaps/emotes/default/24/scalable/wink.svg
        pidgin/pixmaps/emotes/default/24/scalable/worship.svg
        pidgin/pixmaps/emotes/default/24/scalable/yawn.svg
        pidgin/pixmaps/status/11/scalable
        pidgin/pixmaps/status/11/scalable/available.svg
        pidgin/pixmaps/status/11/scalable/away.svg
        pidgin/pixmaps/status/11/scalable/busy.svg
        pidgin/pixmaps/status/11/scalable/chat.svg
        pidgin/pixmaps/status/11/scalable/extended-away.svg
        pidgin/pixmaps/status/11/scalable/invisible.svg
        pidgin/pixmaps/status/11/scalable/offline.svg
        pidgin/pixmaps/status/11/scalable/person.svg
        pidgin/pixmaps/status/16/scalable
        pidgin/pixmaps/status/16/scalable/available.svg
        pidgin/pixmaps/status/16/scalable/away.svg
        pidgin/pixmaps/status/16/scalable/busy.svg
        pidgin/pixmaps/status/16/scalable/chat.svg
        pidgin/pixmaps/status/16/scalable/extended-away.svg
        pidgin/pixmaps/status/16/scalable/invisible.svg
        pidgin/pixmaps/status/16/scalable/log-in.svg
        pidgin/pixmaps/status/16/scalable/log-out.svg
        pidgin/pixmaps/status/16/scalable/message-pending.svg
        pidgin/pixmaps/status/16/scalable/offline.svg
        pidgin/pixmaps/status/16/scalable/person.svg
        pidgin/pixmaps/status/22/scalable
        pidgin/pixmaps/status/22/scalable/available.svg
        pidgin/pixmaps/status/22/scalable/away.svg
        pidgin/pixmaps/status/22/scalable/busy.svg
        pidgin/pixmaps/status/22/scalable/chat.svg
        pidgin/pixmaps/status/22/scalable/extended-away.svg
        pidgin/pixmaps/status/22/scalable/log-in.svg
        pidgin/pixmaps/status/22/scalable/log-out.svg
        pidgin/pixmaps/status/22/scalable/offline.svg
        pidgin/pixmaps/status/22/scalable/person.svg
        pidgin/pixmaps/status/22/scalable/sign-off.svg
        pidgin/pixmaps/status/22/scalable/sign-on.svg
        pidgin/pixmaps/status/32/scalable
        pidgin/pixmaps/status/32/scalable/available.svg
        pidgin/pixmaps/status/32/scalable/away.svg
        pidgin/pixmaps/status/32/scalable/busy.svg
        pidgin/pixmaps/status/32/scalable/chat.svg
        pidgin/pixmaps/status/32/scalable/extended-away.svg
        pidgin/pixmaps/status/32/scalable/log-in.svg
        pidgin/pixmaps/status/32/scalable/log-out.svg
        pidgin/pixmaps/status/32/scalable/offline.svg
        pidgin/pixmaps/status/32/scalable/person.svg
        pidgin/pixmaps/tray/16/scalable
        pidgin/pixmaps/tray/16/scalable/tray-away.svg
        pidgin/pixmaps/tray/16/scalable/tray-busy.svg
        pidgin/pixmaps/tray/16/scalable/tray-connecting.svg
        pidgin/pixmaps/tray/16/scalable/tray-extended-away.svg
        pidgin/pixmaps/tray/16/scalable/tray-invisible.svg
        pidgin/pixmaps/tray/16/scalable/tray-message.svg
        pidgin/pixmaps/tray/16/scalable/tray-offline.svg
        pidgin/pixmaps/tray/16/scalable/tray-online.svg
        pidgin/pixmaps/tray/22/scalable
        pidgin/pixmaps/tray/22/scalable/tray-away.svg
        pidgin/pixmaps/tray/22/scalable/tray-busy.svg
        pidgin/pixmaps/tray/22/scalable/tray-extended-away.svg
        pidgin/pixmaps/tray/22/scalable/tray-invisible.svg
        pidgin/pixmaps/tray/22/scalable/tray-message-new.svg
        pidgin/pixmaps/tray/22/scalable/tray-offline.svg
        pidgin/pixmaps/tray/22/scalable/tray-online.svg
        pidgin/pixmaps/tray/32/scalable
        pidgin/pixmaps/tray/48/scalable
Added files:
        pidgin/pidginstock-artwork.c
        pidgin/pixmaps/animations/16/process-working0.png
        pidgin/pixmaps/animations/16/process-working1.png
        pidgin/pixmaps/animations/16/process-working10.png
        pidgin/pixmaps/animations/16/process-working11.png
        pidgin/pixmaps/animations/16/process-working12.png
        pidgin/pixmaps/animations/16/process-working13.png
        pidgin/pixmaps/animations/16/process-working14.png
        pidgin/pixmaps/animations/16/process-working15.png
        pidgin/pixmaps/animations/16/process-working16.png
        pidgin/pixmaps/animations/16/process-working17.png
        pidgin/pixmaps/animations/16/process-working18.png
        pidgin/pixmaps/animations/16/process-working19.png
        pidgin/pixmaps/animations/16/process-working2.png
        pidgin/pixmaps/animations/16/process-working20.png
        pidgin/pixmaps/animations/16/process-working21.png
        pidgin/pixmaps/animations/16/process-working22.png
        pidgin/pixmaps/animations/16/process-working23.png
        pidgin/pixmaps/animations/16/process-working24.png
        pidgin/pixmaps/animations/16/process-working25.png
        pidgin/pixmaps/animations/16/process-working26.png
        pidgin/pixmaps/animations/16/process-working27.png
        pidgin/pixmaps/animations/16/process-working28.png
        pidgin/pixmaps/animations/16/process-working29.png
        pidgin/pixmaps/animations/16/process-working3.png
        pidgin/pixmaps/animations/16/process-working30.png
        pidgin/pixmaps/animations/16/process-working4.png
        pidgin/pixmaps/animations/16/process-working5.png
        pidgin/pixmaps/animations/16/process-working6.png
        pidgin/pixmaps/animations/16/process-working7.png
        pidgin/pixmaps/animations/16/process-working8.png
        pidgin/pixmaps/animations/16/process-working9.png
        pidgin/pixmaps/art-tools/clean-svg-definitions.sh
        pidgin/pixmaps/art-tools/render-pidgin-emotes.rb
        pidgin/pixmaps/dialogs/64/scalable/mail.svg
        pidgin/pixmaps/emotes/default/24/scalable/bunny.svg
        pidgin/pixmaps/emotes/default/24/scalable/pidgin-emotes.svg
        pidgin/pixmaps/protocols/16/scalable/google-talk.svg
        pidgin/pixmaps/status/svg/pidgin-status.svg po/ga.po
        share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
Added directories:
        pidgin/pixmaps/art-tools pidgin/pixmaps/status/svg
Modified files:
        .mtn-ignore AUTHORS COPYRIGHT ChangeLog ChangeLog.win32
        Makefile.am Makefile.mingw NEWS configure.ac
        doc/funniest_home_convos.txt doc/pidgin.1.in
        finch/gntaccount.c finch/gntblist.c finch/gntnotify.c
        finch/gntpounce.c finch/libgnt/gntmenu.c
        finch/libgnt/wms/Makefile.am finch/plugins/Makefile.am
        finch/plugins/grouping.c libpurple/account.c
        libpurple/buddyicon.c libpurple/buddyicon.h
        libpurple/certificate.c libpurple/dbus-maybe.h
        libpurple/dnsquery.c libpurple/log.c
        libpurple/plugins/Makefile.am libpurple/plugins/autoaccept.c
        libpurple/plugins/joinpart.c libpurple/plugins/log_reader.c
        libpurple/plugins/perl/perl.c
        libpurple/plugins/ssl/ssl-nss.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/msn/error.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/AUTHORS
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_info.h
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_list.h
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/char_conv.c
        libpurple/protocols/qq/file_trans.c
        libpurple/protocols/qq/group.c
        libpurple/protocols/qq/group.h
        libpurple/protocols/qq/group_conv.c
        libpurple/protocols/qq/group_conv.h
        libpurple/protocols/qq/group_find.c
        libpurple/protocols/qq/group_find.h
        libpurple/protocols/qq/group_free.c
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/group_im.h
        libpurple/protocols/qq/group_info.c
        libpurple/protocols/qq/group_info.h
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/group_internal.h
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/group_join.h
        libpurple/protocols/qq/group_opt.c
        libpurple/protocols/qq/group_opt.h
        libpurple/protocols/qq/group_search.c
        libpurple/protocols/qq/header_info.c
        libpurple/protocols/qq/header_info.h
        libpurple/protocols/qq/im.c libpurple/protocols/qq/im.h
        libpurple/protocols/qq/packet_parse.c
        libpurple/protocols/qq/qq.c libpurple/protocols/qq/qq.h
        libpurple/protocols/qq/qq_base.c
        libpurple/protocols/qq/qq_base.h
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_network.h
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/qq_process.h
        libpurple/protocols/qq/qq_trans.c
        libpurple/protocols/qq/qq_trans.h
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/qq/sys_msg.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/qq/utils.h
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_auth.c
        libpurple/protocols/yahoo/yahoo_auth.h
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c libpurple/proxy.c
        libpurple/sslconn.h libpurple/util.c
        libpurple/win32/giowin32.c libpurple/win32/libc_interface.h
        libpurple/win32/libc_internal.h libpurple/win32/win32dep.c
        libpurple/win32/win32dep.h pidgin/gtkaccount.c
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdialogs.c
        pidgin/gtkimhtmltoolbar.c pidgin/gtknotify.c
        pidgin/gtkprefs.c pidgin/gtksmiley.c pidgin/gtkstatusbox.c
        pidgin/gtkstatusbox.h pidgin/pidginstock.c
        pidgin/pidginstock.h pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/Makefile.mingw
        pidgin/pixmaps/dialogs/64/auth.png
        pidgin/pixmaps/dialogs/64/cool.png
        pidgin/pixmaps/dialogs/64/dialog.png
        pidgin/pixmaps/dialogs/64/error.png
        pidgin/pixmaps/dialogs/64/info.png
        pidgin/pixmaps/dialogs/64/mail.png
        pidgin/pixmaps/dialogs/64/question.png
        pidgin/pixmaps/dialogs/64/scalable/auth.svg
        pidgin/pixmaps/dialogs/64/scalable/cool.svg
        pidgin/pixmaps/dialogs/64/scalable/dialog.svg
        pidgin/pixmaps/dialogs/64/scalable/error.svg
        pidgin/pixmaps/dialogs/64/scalable/info.svg
        pidgin/pixmaps/dialogs/64/scalable/question.svg
        pidgin/pixmaps/dialogs/64/scalable/warning.svg
        pidgin/pixmaps/dialogs/64/warning.png
        pidgin/pixmaps/emotes/default/24/Makefile.mingw
        pidgin/pixmaps/emotes/default/24/act-up.png
        pidgin/pixmaps/emotes/default/24/alien.png
        pidgin/pixmaps/emotes/default/24/angel.png
        pidgin/pixmaps/emotes/default/24/angry.png
        pidgin/pixmaps/emotes/default/24/arrogant.png
        pidgin/pixmaps/emotes/default/24/at-wits-end.png
        pidgin/pixmaps/emotes/default/24/bashful.png
        pidgin/pixmaps/emotes/default/24/beat-up.png
        pidgin/pixmaps/emotes/default/24/beauty.png
        pidgin/pixmaps/emotes/default/24/blowkiss.png
        pidgin/pixmaps/emotes/default/24/bulgy-eyes.png
        pidgin/pixmaps/emotes/default/24/bye.png
        pidgin/pixmaps/emotes/default/24/call-me.png
        pidgin/pixmaps/emotes/default/24/clap.png
        pidgin/pixmaps/emotes/default/24/clover.png
        pidgin/pixmaps/emotes/default/24/confused.png
        pidgin/pixmaps/emotes/default/24/cowboy.png
        pidgin/pixmaps/emotes/default/24/crying.png
        pidgin/pixmaps/emotes/default/24/curl-lip.png
        pidgin/pixmaps/emotes/default/24/curse.png
        pidgin/pixmaps/emotes/default/24/cute.png
        pidgin/pixmaps/emotes/default/24/cyclops.png
        pidgin/pixmaps/emotes/default/24/dance.png
        pidgin/pixmaps/emotes/default/24/dazed.png
        pidgin/pixmaps/emotes/default/24/desire.png
        pidgin/pixmaps/emotes/default/24/devil.png
        pidgin/pixmaps/emotes/default/24/disappointed.png
        pidgin/pixmaps/emotes/default/24/disdain.png
        pidgin/pixmaps/emotes/default/24/doctor.png
        pidgin/pixmaps/emotes/default/24/doh.png
        pidgin/pixmaps/emotes/default/24/dont-know.png
        pidgin/pixmaps/emotes/default/24/drool.png
        pidgin/pixmaps/emotes/default/24/eat.png
        pidgin/pixmaps/emotes/default/24/embarrassed.png
        pidgin/pixmaps/emotes/default/24/excruciating.png
        pidgin/pixmaps/emotes/default/24/eyeroll.png
        pidgin/pixmaps/emotes/default/24/female-fighter.png
        pidgin/pixmaps/emotes/default/24/fingers-crossed.png
        pidgin/pixmaps/emotes/default/24/foot-in-mouth.png
        pidgin/pixmaps/emotes/default/24/freaked-out.png
        pidgin/pixmaps/emotes/default/24/giggle.png
        pidgin/pixmaps/emotes/default/24/glasses-cool.png
        pidgin/pixmaps/emotes/default/24/glasses-nerdy.png
        pidgin/pixmaps/emotes/default/24/go-away.png
        pidgin/pixmaps/emotes/default/24/handshake.png
        pidgin/pixmaps/emotes/default/24/highfive.png
        pidgin/pixmaps/emotes/default/24/hug-left.png
        pidgin/pixmaps/emotes/default/24/hug-right.png
        pidgin/pixmaps/emotes/default/24/hypnotized.png
        pidgin/pixmaps/emotes/default/24/in-love.png
        pidgin/pixmaps/emotes/default/24/jump.png
        pidgin/pixmaps/emotes/default/24/kiss.png
        pidgin/pixmaps/emotes/default/24/kissed.png
        pidgin/pixmaps/emotes/default/24/kissing.png
        pidgin/pixmaps/emotes/default/24/lashes.png
        pidgin/pixmaps/emotes/default/24/laugh.png
        pidgin/pixmaps/emotes/default/24/lying.png
        pidgin/pixmaps/emotes/default/24/mad-tongue.png
        pidgin/pixmaps/emotes/default/24/male-fighter2.png
        pidgin/pixmaps/emotes/default/24/mean.png
        pidgin/pixmaps/emotes/default/24/meeting.png
        pidgin/pixmaps/emotes/default/24/messed.png
        pidgin/pixmaps/emotes/default/24/mohawk.png
        pidgin/pixmaps/emotes/default/24/moneymouth.png
        pidgin/pixmaps/emotes/default/24/music.png
        pidgin/pixmaps/emotes/default/24/nailbiting.png
        pidgin/pixmaps/emotes/default/24/neutral.png
        pidgin/pixmaps/emotes/default/24/on-the-phone.png
        pidgin/pixmaps/emotes/default/24/party.png
        pidgin/pixmaps/emotes/default/24/pirate.png
        pidgin/pixmaps/emotes/default/24/pissed-off.png
        pidgin/pixmaps/emotes/default/24/poop.png
        pidgin/pixmaps/emotes/default/24/pray.png
        pidgin/pixmaps/emotes/default/24/question.png
        pidgin/pixmaps/emotes/default/24/quiet.png
        pidgin/pixmaps/emotes/default/24/rotfl.png
        pidgin/pixmaps/emotes/default/24/sad.png
        pidgin/pixmaps/emotes/default/24/sarcastic.png
        pidgin/pixmaps/emotes/default/24/scalable/airplane.svg
        pidgin/pixmaps/emotes/default/24/scalable/bad.svg
        pidgin/pixmaps/emotes/default/24/scalable/beer.svg
        pidgin/pixmaps/emotes/default/24/scalable/bomb.svg
        pidgin/pixmaps/emotes/default/24/scalable/bowl.svg
        pidgin/pixmaps/emotes/default/24/scalable/boy.svg
        pidgin/pixmaps/emotes/default/24/scalable/brb.svg
        pidgin/pixmaps/emotes/default/24/scalable/cake.svg
        pidgin/pixmaps/emotes/default/24/scalable/camera.svg
        pidgin/pixmaps/emotes/default/24/scalable/car.svg
        pidgin/pixmaps/emotes/default/24/scalable/cat.svg
        pidgin/pixmaps/emotes/default/24/scalable/cigarette.svg
        pidgin/pixmaps/emotes/default/24/scalable/clock.svg
        pidgin/pixmaps/emotes/default/24/scalable/clover.svg
        pidgin/pixmaps/emotes/default/24/scalable/coffee.svg
        pidgin/pixmaps/emotes/default/24/scalable/coins.svg
        pidgin/pixmaps/emotes/default/24/scalable/computer.svg
        pidgin/pixmaps/emotes/default/24/scalable/console.svg
        pidgin/pixmaps/emotes/default/24/scalable/dog.svg
        pidgin/pixmaps/emotes/default/24/scalable/drink.svg
        pidgin/pixmaps/emotes/default/24/scalable/film.svg
        pidgin/pixmaps/emotes/default/24/scalable/girl.svg
        pidgin/pixmaps/emotes/default/24/scalable/goat.svg
        pidgin/pixmaps/emotes/default/24/scalable/good.svg
        pidgin/pixmaps/emotes/default/24/scalable/handcuffs.svg
        pidgin/pixmaps/emotes/default/24/scalable/island.svg
        pidgin/pixmaps/emotes/default/24/scalable/lamp.svg
        pidgin/pixmaps/emotes/default/24/scalable/love-over.svg
        pidgin/pixmaps/emotes/default/24/scalable/love.svg
        pidgin/pixmaps/emotes/default/24/scalable/mail.svg
        pidgin/pixmaps/emotes/default/24/scalable/mobile.svg
        pidgin/pixmaps/emotes/default/24/scalable/moon.svg
        pidgin/pixmaps/emotes/default/24/scalable/msn.svg
        pidgin/pixmaps/emotes/default/24/scalable/musical-note.svg
        pidgin/pixmaps/emotes/default/24/scalable/phone.svg
        pidgin/pixmaps/emotes/default/24/scalable/pizza.svg
        pidgin/pixmaps/emotes/default/24/scalable/plate.svg
        pidgin/pixmaps/emotes/default/24/scalable/poop.svg
        pidgin/pixmaps/emotes/default/24/scalable/present.svg
        pidgin/pixmaps/emotes/default/24/scalable/rain.svg
        pidgin/pixmaps/emotes/default/24/scalable/rose-dead.svg
        pidgin/pixmaps/emotes/default/24/scalable/rose.svg
        pidgin/pixmaps/emotes/default/24/scalable/sheep.svg
        pidgin/pixmaps/emotes/default/24/scalable/snail.svg
        pidgin/pixmaps/emotes/default/24/scalable/soccerball.svg
        pidgin/pixmaps/emotes/default/24/scalable/star.svg
        pidgin/pixmaps/emotes/default/24/scalable/sun.svg
        pidgin/pixmaps/emotes/default/24/scalable/thunder.svg
        pidgin/pixmaps/emotes/default/24/scalable/turtle.svg
        pidgin/pixmaps/emotes/default/24/scalable/umbrella.svg
        pidgin/pixmaps/emotes/default/24/secret.png
        pidgin/pixmaps/emotes/default/24/shame.png
        pidgin/pixmaps/emotes/default/24/shock.png
        pidgin/pixmaps/emotes/default/24/shut-mouth.png
        pidgin/pixmaps/emotes/default/24/sick.png
        pidgin/pixmaps/emotes/default/24/sidefrown.png
        pidgin/pixmaps/emotes/default/24/silly.png
        pidgin/pixmaps/emotes/default/24/sinister.png
        pidgin/pixmaps/emotes/default/24/skywalker.png
        pidgin/pixmaps/emotes/default/24/sleepy.png
        pidgin/pixmaps/emotes/default/24/smile-big.png
        pidgin/pixmaps/emotes/default/24/smile.png
        pidgin/pixmaps/emotes/default/24/smirk.png
        pidgin/pixmaps/emotes/default/24/soldier.png
        pidgin/pixmaps/emotes/default/24/starving.png
        pidgin/pixmaps/emotes/default/24/stop.png
        pidgin/pixmaps/emotes/default/24/struggle.png
        pidgin/pixmaps/emotes/default/24/sweat.png
        pidgin/pixmaps/emotes/default/24/talktohand.png
        pidgin/pixmaps/emotes/default/24/terror.png
        pidgin/pixmaps/emotes/default/24/thinking.png
        pidgin/pixmaps/emotes/default/24/time-out.png
        pidgin/pixmaps/emotes/default/24/tongue.png
        pidgin/pixmaps/emotes/default/24/tremble.png
        pidgin/pixmaps/emotes/default/24/vampire.png
        pidgin/pixmaps/emotes/default/24/victory.png
        pidgin/pixmaps/emotes/default/24/waiting.png
        pidgin/pixmaps/emotes/default/24/waving.png
        pidgin/pixmaps/emotes/default/24/weep.png
        pidgin/pixmaps/emotes/default/24/wilt.png
        pidgin/pixmaps/emotes/default/24/wink.png
        pidgin/pixmaps/emotes/default/24/worship.png
        pidgin/pixmaps/emotes/default/24/yawn.png
        pidgin/pixmaps/emotes/none/Makefile.mingw
        pidgin/pixmaps/protocols/16/aim.png
        pidgin/pixmaps/protocols/16/bonjour.png
        pidgin/pixmaps/protocols/16/gadu-gadu.png
        pidgin/pixmaps/protocols/16/google-talk.png
        pidgin/pixmaps/protocols/16/icq.png
        pidgin/pixmaps/protocols/16/irc.png
        pidgin/pixmaps/protocols/16/meanwhile.png
        pidgin/pixmaps/protocols/16/msn.png
        pidgin/pixmaps/protocols/16/novell.png
        pidgin/pixmaps/protocols/16/qq.png
        pidgin/pixmaps/protocols/16/scalable/aim.svg
        pidgin/pixmaps/protocols/16/scalable/bonjour.svg
        pidgin/pixmaps/protocols/16/scalable/gadu-gadu.svg
        pidgin/pixmaps/protocols/16/scalable/icq.svg
        pidgin/pixmaps/protocols/16/scalable/irc.svg
        pidgin/pixmaps/protocols/16/scalable/meanwhile.svg
        pidgin/pixmaps/protocols/16/scalable/msn.svg
        pidgin/pixmaps/protocols/16/scalable/novell.svg
        pidgin/pixmaps/protocols/16/scalable/qq.svg
        pidgin/pixmaps/protocols/16/scalable/silc.svg
        pidgin/pixmaps/protocols/16/scalable/simple.svg
        pidgin/pixmaps/protocols/16/scalable/yahoo.svg
        pidgin/pixmaps/protocols/16/scalable/zephyr.svg
        pidgin/pixmaps/protocols/16/silc.png
        pidgin/pixmaps/protocols/16/simple.png
        pidgin/pixmaps/protocols/16/yahoo.png
        pidgin/pixmaps/protocols/16/zephyr.png
        pidgin/pixmaps/status/11/chat.png
        pidgin/pixmaps/status/11/log-in.png
        pidgin/pixmaps/status/11/log-out.png
        pidgin/pixmaps/status/11/person.png
        pidgin/pixmaps/toolbar/16/emote-select.png
        pidgin/pixmaps/toolbar/16/scalable/emote-select.svg
        pidgin/pixmaps/tray/22/tray-away.png
        pidgin/pixmaps/tray/22/tray-busy.png
        pidgin/pixmaps/tray/22/tray-extended-away.png
        pidgin/pixmaps/tray/22/tray-invisible.png
        pidgin/pixmaps/tray/22/tray-new-im.png
        pidgin/pixmaps/tray/22/tray-offline.png
        pidgin/pixmaps/tray/22/tray-online.png
        pidgin/plugins/Makefile.am pidgin/plugins/Makefile.mingw
        pidgin/plugins/relnot.c
        pidgin/win32/nsis/pidgin-installer.nsi pidgin.spec.in
        po/ChangeLog po/POTFILES.in po/cs.po po/de.po po/es.po
        po/fi.po po/fr.po po/gl.po po/he.po po/it.po po/lt.po
        po/nl.po po/nn.po po/pt_BR.po po/sv.po po/zh_HK.po
        po/zh_TW.po share/ca-certs/Makefile.am
        share/ca-certs/Makefile.mingw
Modified attrs:
        pidgin/pixmaps/animations/16/process-working0.png
        pidgin/pixmaps/animations/16/process-working1.png
        pidgin/pixmaps/animations/16/process-working10.png
        pidgin/pixmaps/animations/16/process-working11.png
        pidgin/pixmaps/animations/16/process-working12.png
        pidgin/pixmaps/animations/16/process-working13.png
        pidgin/pixmaps/animations/16/process-working14.png
        pidgin/pixmaps/animations/16/process-working15.png
        pidgin/pixmaps/animations/16/process-working16.png
        pidgin/pixmaps/animations/16/process-working17.png
        pidgin/pixmaps/animations/16/process-working18.png
        pidgin/pixmaps/animations/16/process-working19.png
        pidgin/pixmaps/animations/16/process-working2.png
        pidgin/pixmaps/animations/16/process-working20.png
        pidgin/pixmaps/animations/16/process-working21.png
        pidgin/pixmaps/animations/16/process-working22.png
        pidgin/pixmaps/animations/16/process-working23.png
        pidgin/pixmaps/animations/16/process-working24.png
        pidgin/pixmaps/animations/16/process-working25.png
        pidgin/pixmaps/animations/16/process-working26.png
        pidgin/pixmaps/animations/16/process-working27.png
        pidgin/pixmaps/animations/16/process-working28.png
        pidgin/pixmaps/animations/16/process-working29.png
        pidgin/pixmaps/animations/16/process-working3.png
        pidgin/pixmaps/animations/16/process-working30.png
        pidgin/pixmaps/animations/16/process-working4.png
        pidgin/pixmaps/animations/16/process-working5.png
        pidgin/pixmaps/animations/16/process-working6.png
        pidgin/pixmaps/animations/16/process-working7.png
        pidgin/pixmaps/animations/16/process-working8.png
        pidgin/pixmaps/animations/16/process-working9.png
        pidgin/pixmaps/art-tools/render-pidgin-emotes.rb

ChangeLog: 

merge of 'd50e4b01c210ebbcd8f8d5a001fa72450e021a97'
     and 'e550112b97817b0eafc647bd8c0adddf2a262a62'



More information about the Commits mailing list