xmpp.custom_smiley: cee47e89: merge of '11a3a54c2fe7e9807a6ef5d4a359d5...

malu at pidgin.im malu at pidgin.im
Wed Sep 17 15:15:51 EDT 2008


-----------------------------------------------------------------
Revision: cee47e89d4165fee17718b78796499e56988afb7
Ancestor: 11a3a54c2fe7e9807a6ef5d4a359d539688c2848
Ancestor: f1e5238a88203202e4fe0fe46b103b854dded719
Author: malu at pidgin.im
Date: 2008-09-17T19:09:43
Branch: im.pidgin.xmpp.custom_smiley
URL: http://d.pidgin.im/viewmtn/revision/info/cee47e89d4165fee17718b78796499e56988afb7

Deleted entries:
        pidgin/artwork pidgin/artwork/art-tools
        pidgin/artwork/art-tools/clean-svg-definitions.sh
        pidgin/artwork/art-tools/render-pidgin-emotes.rb
        pidgin/artwork/hicolor pidgin/artwork/hicolor/16x16
        pidgin/artwork/hicolor/16x16/actions
        pidgin/artwork/hicolor/16x16/actions/pidgin-change-bgcolor.png
        pidgin/artwork/hicolor/16x16/actions/pidgin-change-fgcolor.png
        pidgin/artwork/hicolor/16x16/actions/pidgin-drag-down.png
        pidgin/artwork/hicolor/16x16/actions/pidgin-drag-left.png
        pidgin/artwork/hicolor/16x16/actions/pidgin-drag-right.png
        pidgin/artwork/hicolor/16x16/actions/pidgin-drag-up.png
        pidgin/artwork/hicolor/16x16/actions/pidgin-emote-select.png
        pidgin/artwork/hicolor/16x16/actions/pidgin-font-face.png
        pidgin/artwork/hicolor/16x16/actions/pidgin-font-size-down.png
        pidgin/artwork/hicolor/16x16/actions/pidgin-font-size-up.png
        pidgin/artwork/hicolor/16x16/actions/pidgin-get-attention.png
        pidgin/artwork/hicolor/16x16/actions/pidgin-insert-image.png
        pidgin/artwork/hicolor/16x16/actions/pidgin-insert-link.png
        pidgin/artwork/hicolor/16x16/actions/pidgin-insert.png
        pidgin/artwork/hicolor/16x16/actions/pidgin-message-new.png
        pidgin/artwork/hicolor/16x16/actions/pidgin-send-file.png
        pidgin/artwork/hicolor/16x16/actions/pidgin-unblock.png
        pidgin/artwork/hicolor/16x16/actions/pidgin-view-plugins.png
        pidgin/artwork/hicolor/16x16/actions/pidgin-view-transfers.png
        pidgin/artwork/hicolor/16x16/animations
        pidgin/artwork/hicolor/16x16/animations/process-working0.png
        pidgin/artwork/hicolor/16x16/animations/process-working1.png
        pidgin/artwork/hicolor/16x16/animations/process-working10.png
        pidgin/artwork/hicolor/16x16/animations/process-working11.png
        pidgin/artwork/hicolor/16x16/animations/process-working12.png
        pidgin/artwork/hicolor/16x16/animations/process-working13.png
        pidgin/artwork/hicolor/16x16/animations/process-working14.png
        pidgin/artwork/hicolor/16x16/animations/process-working15.png
        pidgin/artwork/hicolor/16x16/animations/process-working16.png
        pidgin/artwork/hicolor/16x16/animations/process-working17.png
        pidgin/artwork/hicolor/16x16/animations/process-working18.png
        pidgin/artwork/hicolor/16x16/animations/process-working19.png
        pidgin/artwork/hicolor/16x16/animations/process-working2.png
        pidgin/artwork/hicolor/16x16/animations/process-working20.png
        pidgin/artwork/hicolor/16x16/animations/process-working21.png
        pidgin/artwork/hicolor/16x16/animations/process-working22.png
        pidgin/artwork/hicolor/16x16/animations/process-working23.png
        pidgin/artwork/hicolor/16x16/animations/process-working24.png
        pidgin/artwork/hicolor/16x16/animations/process-working25.png
        pidgin/artwork/hicolor/16x16/animations/process-working26.png
        pidgin/artwork/hicolor/16x16/animations/process-working27.png
        pidgin/artwork/hicolor/16x16/animations/process-working28.png
        pidgin/artwork/hicolor/16x16/animations/process-working29.png
        pidgin/artwork/hicolor/16x16/animations/process-working3.png
        pidgin/artwork/hicolor/16x16/animations/process-working30.png
        pidgin/artwork/hicolor/16x16/animations/process-working4.png
        pidgin/artwork/hicolor/16x16/animations/process-working5.png
        pidgin/artwork/hicolor/16x16/animations/process-working6.png
        pidgin/artwork/hicolor/16x16/animations/process-working7.png
        pidgin/artwork/hicolor/16x16/animations/process-working8.png
        pidgin/artwork/hicolor/16x16/animations/process-working9.png
        pidgin/artwork/hicolor/16x16/animations/typing0.png
        pidgin/artwork/hicolor/16x16/animations/typing1.png
        pidgin/artwork/hicolor/16x16/animations/typing2.png
        pidgin/artwork/hicolor/16x16/animations/typing3.png
        pidgin/artwork/hicolor/16x16/animations/typing4.png
        pidgin/artwork/hicolor/16x16/animations/typing5.png
        pidgin/artwork/hicolor/16x16/apps
        pidgin/artwork/hicolor/16x16/apps/pidgin-aim.png
        pidgin/artwork/hicolor/16x16/apps/pidgin-bonjour.png
        pidgin/artwork/hicolor/16x16/apps/pidgin-facebook.png
        pidgin/artwork/hicolor/16x16/apps/pidgin-gadu-gadu.png
        pidgin/artwork/hicolor/16x16/apps/pidgin-google-talk.png
        pidgin/artwork/hicolor/16x16/apps/pidgin-icq.png
        pidgin/artwork/hicolor/16x16/apps/pidgin-irc.png
        pidgin/artwork/hicolor/16x16/apps/pidgin-jabber.png
        pidgin/artwork/hicolor/16x16/apps/pidgin-meanwhile.png
        pidgin/artwork/hicolor/16x16/apps/pidgin-msn.png
        pidgin/artwork/hicolor/16x16/apps/pidgin-myspace.png
        pidgin/artwork/hicolor/16x16/apps/pidgin-novell.png
        pidgin/artwork/hicolor/16x16/apps/pidgin-qq.png
        pidgin/artwork/hicolor/16x16/apps/pidgin-silc.png
        pidgin/artwork/hicolor/16x16/apps/pidgin-simple.png
        pidgin/artwork/hicolor/16x16/apps/pidgin-yahoo.png
        pidgin/artwork/hicolor/16x16/apps/pidgin-zephyr.png
        pidgin/artwork/hicolor/16x16/apps/pidgin.png
        pidgin/artwork/hicolor/16x16/devices
        pidgin/artwork/hicolor/16x16/devices/pidgin-hiptop.png
        pidgin/artwork/hicolor/16x16/devices/pidgin-mobile.png
        pidgin/artwork/hicolor/16x16/emblems
        pidgin/artwork/hicolor/16x16/emblems/pidgin-aol-client.png
        pidgin/artwork/hicolor/16x16/emblems/pidgin-birthday.png
        pidgin/artwork/hicolor/16x16/emblems/pidgin-blocked.png
        pidgin/artwork/hicolor/16x16/emblems/pidgin-bot.png
        pidgin/artwork/hicolor/16x16/emblems/pidgin-external.png
        pidgin/artwork/hicolor/16x16/emblems/pidgin-female.png
        pidgin/artwork/hicolor/16x16/emblems/pidgin-founder.png
        pidgin/artwork/hicolor/16x16/emblems/pidgin-free-for-chat.png
        pidgin/artwork/hicolor/16x16/emblems/pidgin-game.png
        pidgin/artwork/hicolor/16x16/emblems/pidgin-half-operator.png
        pidgin/artwork/hicolor/16x16/emblems/pidgin-male.png
        pidgin/artwork/hicolor/16x16/emblems/pidgin-music.png
        pidgin/artwork/hicolor/16x16/emblems/pidgin-not-authorized.png
        pidgin/artwork/hicolor/16x16/emblems/pidgin-operator.png
        pidgin/artwork/hicolor/16x16/emblems/pidgin-qq-member.png
        pidgin/artwork/hicolor/16x16/emblems/pidgin-secure.png
        pidgin/artwork/hicolor/16x16/emblems/pidgin-unavailable.png
        pidgin/artwork/hicolor/16x16/emblems/pidgin-video.png
        pidgin/artwork/hicolor/16x16/emblems/pidgin-voice.png
        pidgin/artwork/hicolor/16x16/status
        pidgin/artwork/hicolor/16x16/status/pidgin-available.png
        pidgin/artwork/hicolor/16x16/status/pidgin-away.png
        pidgin/artwork/hicolor/16x16/status/pidgin-busy.png
        pidgin/artwork/hicolor/16x16/status/pidgin-chatroom.png
        pidgin/artwork/hicolor/16x16/status/pidgin-contact.png
        pidgin/artwork/hicolor/16x16/status/pidgin-dialog-auth.png
        pidgin/artwork/hicolor/16x16/status/pidgin-dialog-error.png
        pidgin/artwork/hicolor/16x16/status/pidgin-dialog-info.png
        pidgin/artwork/hicolor/16x16/status/pidgin-dialog-mail.png
        pidgin/artwork/hicolor/16x16/status/pidgin-dialog-question.png
        pidgin/artwork/hicolor/16x16/status/pidgin-extended-away.png
        pidgin/artwork/hicolor/16x16/status/pidgin-invisible.png
        pidgin/artwork/hicolor/16x16/status/pidgin-offline.png
        pidgin/artwork/hicolor/16x16/status/pidgin-tray-available.png
        pidgin/artwork/hicolor/16x16/status/pidgin-tray-away.png
        pidgin/artwork/hicolor/16x16/status/pidgin-tray-busy.png
        pidgin/artwork/hicolor/16x16/status/pidgin-tray-extended-away.png
        pidgin/artwork/hicolor/16x16/status/pidgin-tray-invisible.png
        pidgin/artwork/hicolor/16x16/status/pidgin-tray-message-pending.png
        pidgin/artwork/hicolor/16x16/status/pidgin-tray-new-im.png
        pidgin/artwork/hicolor/16x16/status/pidgin-tray-offline.png
        pidgin/artwork/hicolor/22x22
        pidgin/artwork/hicolor/22x22/apps
        pidgin/artwork/hicolor/22x22/apps/pidgin.png
        pidgin/artwork/hicolor/22x22/status
        pidgin/artwork/hicolor/22x22/status/pidgin-available.png
        pidgin/artwork/hicolor/22x22/status/pidgin-away.png
        pidgin/artwork/hicolor/22x22/status/pidgin-busy.png
        pidgin/artwork/hicolor/22x22/status/pidgin-chatroom.png
        pidgin/artwork/hicolor/22x22/status/pidgin-contact.png
        pidgin/artwork/hicolor/22x22/status/pidgin-extended-away.png
        pidgin/artwork/hicolor/22x22/status/pidgin-invisible.png
        pidgin/artwork/hicolor/22x22/status/pidgin-offline.png
        pidgin/artwork/hicolor/22x22/status/pidgin-tray-available.png
        pidgin/artwork/hicolor/22x22/status/pidgin-tray-away.png
        pidgin/artwork/hicolor/22x22/status/pidgin-tray-busy.png
        pidgin/artwork/hicolor/22x22/status/pidgin-tray-extended-away.png
        pidgin/artwork/hicolor/22x22/status/pidgin-tray-invisible.png
        pidgin/artwork/hicolor/22x22/status/pidgin-tray-message-pending.png
        pidgin/artwork/hicolor/22x22/status/pidgin-tray-new-im.png
        pidgin/artwork/hicolor/22x22/status/pidgin-tray-offline.png
        pidgin/artwork/hicolor/24x24
        pidgin/artwork/hicolor/24x24/apps
        pidgin/artwork/hicolor/24x24/apps/pidgin-aim.png
        pidgin/artwork/hicolor/24x24/apps/pidgin-bonjour.png
        pidgin/artwork/hicolor/24x24/apps/pidgin-facebook.png
        pidgin/artwork/hicolor/24x24/apps/pidgin-gadu-gadu.png
        pidgin/artwork/hicolor/24x24/apps/pidgin-google-talk.png
        pidgin/artwork/hicolor/24x24/apps/pidgin-icq.png
        pidgin/artwork/hicolor/24x24/apps/pidgin-irc.png
        pidgin/artwork/hicolor/24x24/apps/pidgin-jabber.png
        pidgin/artwork/hicolor/24x24/apps/pidgin-meanwhile.png
        pidgin/artwork/hicolor/24x24/apps/pidgin-msn.png
        pidgin/artwork/hicolor/24x24/apps/pidgin-myspace.png
        pidgin/artwork/hicolor/24x24/apps/pidgin-novell.png
        pidgin/artwork/hicolor/24x24/apps/pidgin-qq.png
        pidgin/artwork/hicolor/24x24/apps/pidgin-silc.png
        pidgin/artwork/hicolor/24x24/apps/pidgin-simple.png
        pidgin/artwork/hicolor/24x24/apps/pidgin-yahoo.png
        pidgin/artwork/hicolor/24x24/apps/pidgin-zephyr.png
        pidgin/artwork/hicolor/24x24/apps/pidgin.png
        pidgin/artwork/hicolor/24x24/emotes
        pidgin/artwork/hicolor/24x24/emotes/Makefile.am
        pidgin/artwork/hicolor/24x24/emotes/Makefile.mingw
        pidgin/artwork/hicolor/24x24/emotes/default.theme.in
        pidgin/artwork/hicolor/24x24/emotes/none
        pidgin/artwork/hicolor/24x24/emotes/none/Makefile.am
        pidgin/artwork/hicolor/24x24/emotes/none/Makefile.mingw
        pidgin/artwork/hicolor/24x24/emotes/none/none.theme.in
        pidgin/artwork/hicolor/24x24/emotes/none/theme
        pidgin/artwork/hicolor/24x24/emotes/pidgin-act-up.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-airplane.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-alien.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-angel.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-angry.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-arrogant.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-at-wits-end.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-bad.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-bashful.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-beat-up.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-beauty.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-beer.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-blowkiss.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-bomb.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-bowl.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-boy.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-brb.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-bulgy-eyes.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-bunny.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-bye.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-cake.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-call-me.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-camera.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-can.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-car.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-cat.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-chicken.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-cigarette.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-clap.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-clock.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-cloudy.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-clover.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-clown.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-coffee.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-coins.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-computer.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-confused.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-console.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-cow.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-cowboy.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-crying.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-curl-lip.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-curse.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-cute.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-cyclops.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-dance.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-dazed.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-desire.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-devil.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-disappointed.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-disdain.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-doctor.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-dog.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-doh.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-dont-know.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-drink.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-drool.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-eat.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-embarrassed.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-excruciating.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-eyeroll.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-female-fighter.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-film.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-fingers-crossed.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-flag.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-foot-in-mouth.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-freaked-out.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-ghost.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-giggle.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-girl.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-glasses-cool.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-glasses-nerdy.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-go-away.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-goat.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-good.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-hammer.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-handcuffs.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-handshake.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-highfive.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-hug-left.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-hug-right.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-hypnotized.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-in-love.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-island.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-jump.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-kiss.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-kissed.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-kissing.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-knife.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-lamp.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-lashes.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-laugh.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-liquor.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-loser.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-love-over.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-love.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-lying.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-mad-tongue.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-mail.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-male-fighter1.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-male-fighter2.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-mean.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-meeting.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-messed.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-mobile.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-mohawk.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-moneymouth.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-monkey.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-moon.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-msn-away.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-msn-busy.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-msn.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-msn_online.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-music.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-musical-note.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-nailbiting.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-neutral.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-on-the-phone.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-party.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-peace.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-phone.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-pig.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-pill.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-pirate.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-pissed-off.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-pizza.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-plate.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-poop.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-pray.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-present.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-pumpkin.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-qq.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-question.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-quiet.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-rain.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-rainbow.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-rose-dead.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-rose.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-rotfl.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-sad.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-sarcastic.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-search.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-secret.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-shame.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-sheep.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-shock.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-shout.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-shut-mouth.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-sick.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-sidefrown.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-silly.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-sinister.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-skeleton.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-skywalker.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-sleepy.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-smile-big.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-smile.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-smirk.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-snail.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-snicker.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-snowman.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-soccerball.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-soldier.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-star.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-starving.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-stop.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-struggle.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-sun.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-sweat.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-talktohand.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-teeth.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-terror.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-thinking.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-thunder.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-time-out.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-tongue.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-tremble.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-turtle.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-tv.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-umbrella.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-vampire.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-victory.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-waiting.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-watermelon.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-waving.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-weep.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-wilt.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-wink.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-worship.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-yawn.png
        pidgin/artwork/hicolor/24x24/emotes/pidgin-yin-yang.png
        pidgin/artwork/hicolor/24x24/emotes/theme
        pidgin/artwork/hicolor/24x24/status
        pidgin/artwork/hicolor/24x24/status/pidgin-available.png
        pidgin/artwork/hicolor/24x24/status/pidgin-away.png
        pidgin/artwork/hicolor/24x24/status/pidgin-busy.png
        pidgin/artwork/hicolor/24x24/status/pidgin-chatroom.png
        pidgin/artwork/hicolor/24x24/status/pidgin-contact.png
        pidgin/artwork/hicolor/24x24/status/pidgin-extended-away.png
        pidgin/artwork/hicolor/24x24/status/pidgin-invisible.png
        pidgin/artwork/hicolor/24x24/status/pidgin-offline.png
        pidgin/artwork/hicolor/24x24/status/pidgin-tray-available.png
        pidgin/artwork/hicolor/24x24/status/pidgin-tray-away.png
        pidgin/artwork/hicolor/24x24/status/pidgin-tray-busy.png
        pidgin/artwork/hicolor/24x24/status/pidgin-tray-extended-away.png
        pidgin/artwork/hicolor/24x24/status/pidgin-tray-invisible.png
        pidgin/artwork/hicolor/24x24/status/pidgin-tray-message-pending.png
        pidgin/artwork/hicolor/24x24/status/pidgin-tray-new-im.png
        pidgin/artwork/hicolor/24x24/status/pidgin-tray-offline.png
        pidgin/artwork/hicolor/32x32
        pidgin/artwork/hicolor/32x32/actions
        pidgin/artwork/hicolor/32x32/actions/pidgin-select-avatar.png
        pidgin/artwork/hicolor/32x32/apps
        pidgin/artwork/hicolor/32x32/apps/pidgin.png
        pidgin/artwork/hicolor/32x32/status
        pidgin/artwork/hicolor/32x32/status/pidgin-available.png
        pidgin/artwork/hicolor/32x32/status/pidgin-away.png
        pidgin/artwork/hicolor/32x32/status/pidgin-busy.png
        pidgin/artwork/hicolor/32x32/status/pidgin-extended-away.png
        pidgin/artwork/hicolor/32x32/status/pidgin-invisible.png
        pidgin/artwork/hicolor/32x32/status/pidgin-offline.png
        pidgin/artwork/hicolor/32x32/status/pidgin-tray-available.png
        pidgin/artwork/hicolor/32x32/status/pidgin-tray-away.png
        pidgin/artwork/hicolor/32x32/status/pidgin-tray-busy.png
        pidgin/artwork/hicolor/32x32/status/pidgin-tray-extended-away.png
        pidgin/artwork/hicolor/32x32/status/pidgin-tray-invisible.png
        pidgin/artwork/hicolor/32x32/status/pidgin-tray-message-pending.png
        pidgin/artwork/hicolor/32x32/status/pidgin-tray-new-im.png
        pidgin/artwork/hicolor/32x32/status/pidgin-tray-offline.png
        pidgin/artwork/hicolor/48x48
        pidgin/artwork/hicolor/48x48/apps
        pidgin/artwork/hicolor/48x48/apps/pidgin-aim.png
        pidgin/artwork/hicolor/48x48/apps/pidgin-bonjour.png
        pidgin/artwork/hicolor/48x48/apps/pidgin-facebook.png
        pidgin/artwork/hicolor/48x48/apps/pidgin-gadu-gadu.png
        pidgin/artwork/hicolor/48x48/apps/pidgin-icq.png
        pidgin/artwork/hicolor/48x48/apps/pidgin-irc.png
        pidgin/artwork/hicolor/48x48/apps/pidgin-jabber.png
        pidgin/artwork/hicolor/48x48/apps/pidgin-meanwhile.png
        pidgin/artwork/hicolor/48x48/apps/pidgin-msn.png
        pidgin/artwork/hicolor/48x48/apps/pidgin-myspace.png
        pidgin/artwork/hicolor/48x48/apps/pidgin-novell.png
        pidgin/artwork/hicolor/48x48/apps/pidgin-qq.png
        pidgin/artwork/hicolor/48x48/apps/pidgin-silc.png
        pidgin/artwork/hicolor/48x48/apps/pidgin-simple.png
        pidgin/artwork/hicolor/48x48/apps/pidgin-yahoo.png
        pidgin/artwork/hicolor/48x48/apps/pidgin-zephyr.png
        pidgin/artwork/hicolor/48x48/apps/pidgin.png
        pidgin/artwork/hicolor/48x48/status
        pidgin/artwork/hicolor/48x48/status/pidgin-available.png
        pidgin/artwork/hicolor/48x48/status/pidgin-away.png
        pidgin/artwork/hicolor/48x48/status/pidgin-busy.png
        pidgin/artwork/hicolor/48x48/status/pidgin-dialog-auth.png
        pidgin/artwork/hicolor/48x48/status/pidgin-dialog-cool.png
        pidgin/artwork/hicolor/48x48/status/pidgin-dialog-dialog.png
        pidgin/artwork/hicolor/48x48/status/pidgin-dialog-error.png
        pidgin/artwork/hicolor/48x48/status/pidgin-dialog-info.png
        pidgin/artwork/hicolor/48x48/status/pidgin-dialog-mail.png
        pidgin/artwork/hicolor/48x48/status/pidgin-extended-away.png
        pidgin/artwork/hicolor/48x48/status/pidgin-invisible.png
        pidgin/artwork/hicolor/48x48/status/pidgin-offline.png
        pidgin/artwork/hicolor/48x48/status/pidgin-tray-available.png
        pidgin/artwork/hicolor/48x48/status/pidgin-tray-away.png
        pidgin/artwork/hicolor/48x48/status/pidgin-tray-busy.png
        pidgin/artwork/hicolor/48x48/status/pidgin-tray-extended-away.png
        pidgin/artwork/hicolor/48x48/status/pidgin-tray-invisible.png
        pidgin/artwork/hicolor/48x48/status/pidgin-tray-message-pending.png
        pidgin/artwork/hicolor/48x48/status/pidgin-tray-new-im.png
        pidgin/artwork/hicolor/48x48/status/pidgin-tray-offline.png
        pidgin/artwork/hicolor/48x48/status/question.png
        pidgin/artwork/hicolor/48x48/status/warning.png
        pidgin/artwork/hicolor/scalable
        pidgin/artwork/hicolor/scalable/apps
        pidgin/artwork/hicolor/scalable/apps/pidgin.svg
        pidgin/artwork/hicolor/scalable/status
        pidgin/artwork/hicolor/scalable/status/pidgin-auth.svg
        pidgin/artwork/hicolor/scalable/status/pidgin-cool.svg
        pidgin/artwork/hicolor/scalable/status/pidgin-dialog.svg
        pidgin/artwork/hicolor/scalable/status/pidgin-error.svg
        pidgin/artwork/hicolor/scalable/status/pidgin-info.svg
        pidgin/artwork/hicolor/scalable/status/pidgin-mail.svg
        pidgin/artwork/hicolor/scalable/status/pidgin-question.svg
        pidgin/artwork/hicolor/scalable/status/pidgin-warning.svg
        pidgin/artwork/pixmaps pidgin/artwork/pixmaps/logo.png
        pidgin/artwork/pixmaps/pidgin.ico
Modified files:
        .mtn-ignore ChangeLog finch/gntpounce.c
        finch/libgnt/gntmenu.c libpurple/buddyicon.c
        libpurple/buddyicon.h libpurple/dnsquery.c
        libpurple/plugins/ssl/ssl-nss.c
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/soap.c
        libpurple/protocols/oscar/flap_connection.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/yahoo/yahoo_auth.c
        libpurple/protocols/yahoo/yahoo_auth.h libpurple/proxy.c
        libpurple/util.c pidgin/gtkblist.c pidgin/gtkimhtmltoolbar.c
        pidgin/gtkstatusbox.c
        pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg
        po/POTFILES.in

ChangeLog: 

merge of '11a3a54c2fe7e9807a6ef5d4a359d539688c2848'
     and 'f1e5238a88203202e4fe0fe46b103b854dded719'



More information about the Commits mailing list