pidgin: 092383ee: merge of '81070314dbb1793818b946813e1f0c...

evands at pidgin.im evands at pidgin.im
Sat Aug 16 15:54:10 EDT 2008


-----------------------------------------------------------------
Revision: 092383eec9c67873330237582fed5cee9f775a12
Ancestor: 81070314dbb1793818b946813e1f0cdfda74f7ca
Ancestor: bbc2518a5d7e36300f61d147b8133431841f6c9f
Author: evands at pidgin.im
Date: 2008-08-16T19:41:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/092383eec9c67873330237582fed5cee9f775a12

Deleted entries:
        pidgin/pixmaps/emotes/default/24/sigarette.png
Renamed entries:
        pidgin/pixmaps/emotes/default/24/disapointed.png to pidgin/pixmaps/emotes/default/24/disappointed.png
        pidgin/pixmaps/emotes/default/24/scalable/disapointed.svg to pidgin/pixmaps/emotes/default/24/scalable/disappointed.svg
        pidgin/pixmaps/emotes/default/24/scalable/sigarette.svg to pidgin/pixmaps/emotes/default/24/scalable/cigarette.svg
Added files:
        pidgin/pixmaps/emotes/default/24/cigarette.png
        pidgin/pixmaps/status/16/scalable/invisible.svg
        pidgin/pixmaps/tray/22/scalable/tray-away.svg
        pidgin/pixmaps/tray/22/scalable/tray-busy.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
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        configure.ac finch/gntconv.c libpurple/conversation.c
        libpurple/eventloop.h libpurple/network.c
        libpurple/plugins/ssl/ssl-nss.c libpurple/protocols/gg/gg.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/page.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msnp9/directconn.c
        libpurple/protocols/msnp9/servconn.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/qq_network.c pidgin/gtkconv.c
        pidgin/gtkdialogs.c pidgin/gtksmiley.c pidgin/pidginstock.c
        pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/emotes/default/24/Makefile.am
        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/computer.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/default.theme.in
        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/island.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/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/cigarette.svg
        pidgin/pixmaps/emotes/default/24/scalable/disappointed.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/snail.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/icons/hicolor/16x16/apps/pidgin.png
        pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg
        pidgin/pixmaps/icons/hicolor/22x22/apps/pidgin.png
        pidgin/pixmaps/icons/hicolor/22x22/apps/scalable/pidgin.svg
        pidgin/pixmaps/icons/hicolor/24x24/apps/pidgin.png
        pidgin/pixmaps/icons/hicolor/24x24/apps/scalable/pidgin.svg
        pidgin/pixmaps/icons/hicolor/32x32/apps/pidgin.png
        pidgin/pixmaps/icons/hicolor/32x32/apps/scalable/pidgin.svg
        pidgin/pixmaps/icons/hicolor/48x48/apps/pidgin.png
        pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg
        pidgin/pixmaps/logo.png pidgin/pixmaps/pidgin.ico
        pidgin/pixmaps/status/16/chat.png
        pidgin/pixmaps/status/16/invisible.png
        pidgin/pixmaps/status/16/scalable/chat.svg
        pidgin/pixmaps/toolbar/16/insert.png
        pidgin/pixmaps/tray/22/scalable/tray-invisible.svg
        pidgin/pixmaps/tray/22/tray-away.png
        pidgin/pixmaps/tray/22/tray-busy.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/win32/gtkwin32dep.c po/ChangeLog po/cs.po po/es.po
        po/et.po po/he.po po/hu.po po/it.po po/nl.po po/nn.po
        po/pt_BR.po po/ro.po po/si.po po/sl.po po/sq.po po/vi.po
        po/zh_HK.po po/zh_TW.po
Modified attrs:
        pidgin/pixmaps/emotes/default/24/cigarette.png

ChangeLog: 

merge of '81070314dbb1793818b946813e1f0cdfda74f7ca'
     and 'bbc2518a5d7e36300f61d147b8133431841f6c9f'



More information about the Commits mailing list