soc.2008.masterpassword: 374e706e: merge of '203a080d5a5df77c69a01429019a61...
scrouaf at soc.pidgin.im
scrouaf at soc.pidgin.im
Wed Aug 13 18:01:01 EDT 2008
-----------------------------------------------------------------
Revision: 374e706ed07438c1140bd5cabe48958c47829868
Ancestor: 203a080d5a5df77c69a01429019a61298a2ed229
Ancestor: 8434afa7221e932dc688f0d404a16f22ac8cde59
Author: scrouaf at soc.pidgin.im
Date: 2008-08-13T21:48:58
Branch: im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/374e706ed07438c1140bd5cabe48958c47829868
Deleted entries:
libpurple/plugins/internalkeyring.c
Modified files:
COPYRIGHT libpurple/network.c
libpurple/protocols/bonjour/bonjour_ft.c
libpurple/protocols/bonjour/jabber.c
libpurple/protocols/irc/dcc_send.c
libpurple/protocols/jabber/caps.c
libpurple/protocols/jabber/si.c
libpurple/protocols/msn/contact.h
libpurple/protocols/msn/directconn.c
libpurple/protocols/msn/httpconn.c
libpurple/protocols/msn/msn.c
libpurple/protocols/msn/nexus.c
libpurple/protocols/msn/servconn.c
libpurple/protocols/msn/soap.c
libpurple/protocols/msn/state.c
libpurple/protocols/msn/transaction.h
libpurple/protocols/msnp9/directconn.c
libpurple/protocols/msnp9/msn.c
libpurple/protocols/msnp9/servconn.c
libpurple/protocols/myspace/zap.c
libpurple/protocols/oscar/oscar.c
libpurple/protocols/oscar/peer.c
libpurple/protocols/qq/qq_network.c
libpurple/protocols/simple/simple.c
libpurple/protocols/yahoo/yahoo.c pidgin/gtkdocklet-x11.c
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/disapointed.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/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/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/toolbar/16/insert.png po/de.po po/fi.po
po/nl.po
ChangeLog:
merge of '203a080d5a5df77c69a01429019a61298a2ed229'
and '8434afa7221e932dc688f0d404a16f22ac8cde59'
More information about the Commits
mailing list