cpw.malu.xmpp.jingle_ft: 388ed2b5: propagate from branch 'im.pidgin.pidgin'...
malu at pidgin.im
malu at pidgin.im
Tue Mar 2 17:06:06 EST 2010
-----------------------------------------------------------------
Revision: 388ed2b5ef003924356c4896e64cb779a1d5c1b3
Ancestor: 9830967af3f744375e141b3b4bbfb9ca309bb137
Ancestor: c94e3f15ffb8d4f569d41661e7a89c1c441947ce
Author: malu at pidgin.im
Date: 2010-03-02T22:01:33
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/388ed2b5ef003924356c4896e64cb779a1d5c1b3
Deleted entries:
pidgin/gtkdocklet-x11.c
Renamed entries:
pidgin/pixmaps/emblems/16/mobile.png to pidgin/pixmaps/emotes/small/16/mobile.png
pidgin/pixmaps/emblems/16/music.png to pidgin/pixmaps/emotes/small/16/music.png
pidgin/pixmaps/emblems/scalable/mobile.svg to pidgin/pixmaps/emotes/small/16/scalable/mobile.svg
pidgin/pixmaps/emblems/scalable/music.svg to pidgin/pixmaps/emotes/small/16/scalable/music.svg
pidgin/pixmaps/emotes/default/24/eat.png to pidgin/pixmaps/emotes/default/24/hungry.png
pidgin/pixmaps/emotes/default/24/in-love.png to pidgin/pixmaps/emotes/default/24/amorous.png
pidgin/pixmaps/emotes/default/24/love.png to pidgin/pixmaps/emotes/default/24/in_love.png
pidgin/pixmaps/emotes/default/24/nailbiting.png to pidgin/pixmaps/emotes/default/24/nervous.png
pidgin/pixmaps/emotes/default/24/shock.png to pidgin/pixmaps/emotes/default/24/shocked.png
pidgin/pixmaps/emotes/default/24/sleepy.png to pidgin/pixmaps/emotes/default/24/sleeping.png
pidgin/pixmaps/emotes/default/24/smile-big.png to pidgin/pixmaps/emotes/default/24/excited.png
pidgin/pixmaps/emotes/default/24/smile.png to pidgin/pixmaps/emotes/default/24/happy.png
pidgin/pixmaps/emotes/default/24/sweat.png to pidgin/pixmaps/emotes/default/24/hot.png
pidgin/pixmaps/emotes/default/24/tremble.png to pidgin/pixmaps/emotes/default/24/afraid.png
pidgin/pixmaps/emotes/default/24/yawn.png to pidgin/pixmaps/emotes/default/24/sleepy.png
pidgin/pixmaps/emotes/small/16/love.png to pidgin/pixmaps/emotes/small/16/in_love.png
pidgin/pixmaps/emotes/small/16/shock.png to pidgin/pixmaps/emotes/small/16/shocked.png
pidgin/pixmaps/emotes/small/16/sleepy.png to pidgin/pixmaps/emotes/small/16/sleeping.png
pidgin/pixmaps/emotes/small/16/smile-big.png to pidgin/pixmaps/emotes/small/16/excited.png
pidgin/pixmaps/emotes/small/16/smile.png to pidgin/pixmaps/emotes/small/16/happy.png
pidgin/pixmaps/emotes/small/16/yawn.png to pidgin/pixmaps/emotes/small/16/sleepy.png
Added files:
libpurple/protocols/jabber/jingle/file-transfer.c
libpurple/protocols/jabber/jingle/file-transfer.h
libpurple/protocols/jabber/jingle/ibbs.c
libpurple/protocols/jabber/jingle/ibbs.h
libpurple/protocols/jabber/jingle/s5b.c
libpurple/protocols/jabber/jingle/s5b.h
libpurple/protocols/jabber/xfer.c
libpurple/protocols/jabber/xfer.h
pidgin/pixmaps/emotes/small/16/afraid.png
pidgin/pixmaps/emotes/small/16/amorous.png
pidgin/pixmaps/emotes/small/16/bathing.png
pidgin/pixmaps/emotes/small/16/cinema.png
pidgin/pixmaps/emotes/small/16/disappointed.png
pidgin/pixmaps/emotes/small/16/embarrassed.png
pidgin/pixmaps/emotes/small/16/hot.png
pidgin/pixmaps/emotes/small/16/hungry.png
pidgin/pixmaps/emotes/small/16/internet.png
pidgin/pixmaps/emotes/small/16/mean.png
pidgin/pixmaps/emotes/small/16/nervous.png
pidgin/pixmaps/emotes/small/16/restroom.png
pidgin/pixmaps/emotes/small/16/sarcastic.png
pidgin/pixmaps/emotes/small/16/shopping.png
pidgin/pixmaps/emotes/small/16/studying.png
pidgin/pixmaps/emotes/small/16/suit.png
pidgin/pixmaps/emotes/small/16/surfing.png
pidgin/pixmaps/emotes/small/16/typing.png
pidgin/pixmaps/emotes/small/16/working.png
pidgin/pixmaps/emotes/small/16/writing.png
pidgin/win32/nsis/generate_gtk_zip.sh
Modified files:
.mtn-ignore COPYRIGHT ChangeLog ChangeLog.API
ChangeLog.win32 Makefile.mingw finch/gntplugin.c
finch/gntprefs.c finch/plugins/gnthistory.c
libpurple/Makefile.mingw libpurple/example/nullclient.c
libpurple/ft.c libpurple/log.c
libpurple/plugins/log_reader.c
libpurple/plugins/perl/common/Request.xs
libpurple/plugins/perl/common/module.h
libpurple/plugins/perl/perl-common.h
libpurple/plugins/ssl/Makefile.mingw
libpurple/protocols/bonjour/Makefile.mingw
libpurple/protocols/bonjour/bonjour.c
libpurple/protocols/bonjour/bonjour_ft.c
libpurple/protocols/bonjour/jabber.c
libpurple/protocols/bonjour/jabber.h
libpurple/protocols/bonjour/mdns_avahi.c
libpurple/protocols/bonjour/mdns_win32.c
libpurple/protocols/gg/gg.c libpurple/protocols/irc/irc.c
libpurple/protocols/jabber/Makefile.am
libpurple/protocols/jabber/Makefile.mingw
libpurple/protocols/jabber/ibb.c
libpurple/protocols/jabber/ibb.h
libpurple/protocols/jabber/jabber.c
libpurple/protocols/jabber/jabber.h
libpurple/protocols/jabber/jingle/jingle.c
libpurple/protocols/jabber/jingle/jingle.h
libpurple/protocols/jabber/libxmpp.c
libpurple/protocols/jabber/pep.c
libpurple/protocols/jabber/presence.c
libpurple/protocols/jabber/si.c
libpurple/protocols/jabber/useravatar.c
libpurple/protocols/jabber/usermood.c
libpurple/protocols/jabber/usermood.h
libpurple/protocols/jabber/usernick.c
libpurple/protocols/jabber/xdata.c
libpurple/protocols/msn/msn.c libpurple/protocols/msn/slp.c
libpurple/protocols/msn/slp.h
libpurple/protocols/msn/slplink.c
libpurple/protocols/mxit/mxit.c
libpurple/protocols/mxit/mxit.h
libpurple/protocols/myspace/myspace.c
libpurple/protocols/novell/novell.c
libpurple/protocols/null/nullprpl.c
libpurple/protocols/oscar/clientlogin.c
libpurple/protocols/oscar/family_buddy.c
libpurple/protocols/oscar/family_icbm.c
libpurple/protocols/oscar/family_locate.c
libpurple/protocols/oscar/flap_connection.c
libpurple/protocols/oscar/libaim.c
libpurple/protocols/oscar/libicq.c
libpurple/protocols/oscar/oscar.c
libpurple/protocols/oscar/oscar.h
libpurple/protocols/oscar/oscarcommon.h
libpurple/protocols/oscar/tlv.c libpurple/protocols/qq/qq.c
libpurple/protocols/sametime/sametime.c
libpurple/protocols/silc/buddy.c
libpurple/protocols/silc/chat.c
libpurple/protocols/silc/silc.c
libpurple/protocols/silc10/buddy.c
libpurple/protocols/silc10/chat.c
libpurple/protocols/simple/simple.c
libpurple/protocols/yahoo/libyahoo.c
libpurple/protocols/yahoo/libyahoojp.c
libpurple/protocols/zephyr/zephyr.c libpurple/prpl.h
libpurple/request.c libpurple/request.h libpurple/status.c
libpurple/status.h libpurple/win32/global.mak
libpurple/win32/libc_interface.c
libpurple/win32/libc_interface.h libpurple/win32/win32dep.c
pidgin/Makefile.am pidgin/gtkblist.c pidgin/gtkdebug.c
pidgin/gtkdocklet-gtk.c pidgin/gtkft.c pidgin/gtkprefs.c
pidgin/gtkprivacy.c pidgin/gtkrequest.c
pidgin/gtksavedstatuses.c pidgin/gtkutils.c
pidgin/pidginstock.c pidgin/pixmaps/Makefile.am
pidgin/pixmaps/emotes/default/24/Makefile.am
pidgin/pixmaps/emotes/default/24/default.theme.in
pidgin/pixmaps/emotes/small/16/Makefile.am
pidgin/pixmaps/emotes/small/16/TODO
pidgin/pixmaps/emotes/small/16/small.theme.in
pidgin/plugins/gestures/gestures.c
pidgin/plugins/gevolution/assoc-buddy.c
pidgin/plugins/gtkbuddynote.c
pidgin/plugins/win32/transparency/win2ktrans.c
pidgin/plugins/xmppconsole.c pidgin/win32/gtkwin32dep.c
pidgin/win32/nsis/langmacros.nsh
pidgin/win32/nsis/pidgin-installer.nsi
pidgin/win32/nsis/translations/english.nsh
pidgin/win32/nsis/translations/norwegian_nynorsk.nsh
pidgin/win32/nsis/translations/polish.nsh po/POTFILES.in
Modified attrs:
pidgin/pixmaps/emotes/small/16/afraid.png
pidgin/pixmaps/emotes/small/16/amorous.png
pidgin/pixmaps/emotes/small/16/bathing.png
pidgin/pixmaps/emotes/small/16/cinema.png
pidgin/pixmaps/emotes/small/16/disappointed.png
pidgin/pixmaps/emotes/small/16/embarrassed.png
pidgin/pixmaps/emotes/small/16/hot.png
pidgin/pixmaps/emotes/small/16/hungry.png
pidgin/pixmaps/emotes/small/16/internet.png
pidgin/pixmaps/emotes/small/16/mean.png
pidgin/pixmaps/emotes/small/16/nervous.png
pidgin/pixmaps/emotes/small/16/restroom.png
pidgin/pixmaps/emotes/small/16/sarcastic.png
pidgin/pixmaps/emotes/small/16/shopping.png
pidgin/pixmaps/emotes/small/16/studying.png
pidgin/pixmaps/emotes/small/16/suit.png
pidgin/pixmaps/emotes/small/16/surfing.png
pidgin/pixmaps/emotes/small/16/typing.png
pidgin/pixmaps/emotes/small/16/working.png
pidgin/pixmaps/emotes/small/16/writing.png
pidgin/win32/nsis/generate_gtk_zip.sh
ChangeLog:
propagate from branch 'im.pidgin.pidgin' (head c94e3f15ffb8d4f569d41661e7a89c1c441947ce)
to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 9830967af3f744375e141b3b4bbfb9ca309bb137)
More information about the Commits
mailing list