cpw.malu.xmpp.jingle_ft: 70b8a0e9: propagate from branch 'im.pidgin.pidgin'...
malu at pidgin.im
malu at pidgin.im
Sun Aug 8 14:57:22 EDT 2010
----------------------------------------------------------------------
Revision: 70b8a0e9987dff3de9c91b6e2b48c0b5f927cb6c
Parent: 6156c597e7d5a7702b6915a78bef090253dd0090
Parent: f103ea1850f0b66ee86ac94d1303bbc5437fbf58
Author: malu at pidgin.im
Date: 08/08/10 14:50:59
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/70b8a0e9987dff3de9c91b6e2b48c0b5f927cb6c
Changelog:
propagate from branch 'im.pidgin.pidgin' (head 6156c597e7d5a7702b6915a78bef090253dd0090)
to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head f103ea1850f0b66ee86ac94d1303bbc5437fbf58)
Changes against parent 6156c597e7d5a7702b6915a78bef090253dd0090
added libpurple/protocols/jabber/jingle/file-transfer.c
added libpurple/protocols/jabber/jingle/file-transfer.h
added libpurple/protocols/jabber/jingle/ibbs.c
added libpurple/protocols/jabber/jingle/ibbs.h
added libpurple/protocols/jabber/jingle/s5b.c
added libpurple/protocols/jabber/jingle/s5b.h
added libpurple/protocols/jabber/socks5.c
added libpurple/protocols/jabber/socks5.h
added libpurple/protocols/jabber/xfer.c
added libpurple/protocols/jabber/xfer.h
patched libpurple/ft.c
patched libpurple/protocols/jabber/Makefile.am
patched libpurple/protocols/jabber/Makefile.mingw
patched libpurple/protocols/jabber/data.c
patched libpurple/protocols/jabber/jabber.c
patched libpurple/protocols/jabber/jingle/jingle.c
patched libpurple/protocols/jabber/jingle/jingle.h
patched libpurple/protocols/jabber/jingle/rtp.c
patched libpurple/protocols/jabber/jingle/session.c
patched libpurple/protocols/jabber/jingle/session.h
patched libpurple/protocols/jabber/libxmpp.c
patched libpurple/protocols/jabber/si.c
Changes against parent f103ea1850f0b66ee86ac94d1303bbc5437fbf58
added pidgin/pixmaps/emotes/default/24/bored.png
added pidgin/pixmaps/emotes/default/24/cold.png
added pidgin/pixmaps/emotes/default/24/stressed.png
added pidgin/pixmaps/emotes/small/16/bored.png
added pidgin/pixmaps/emotes/small/16/boy.png
added pidgin/pixmaps/emotes/small/16/chilli.png
added pidgin/pixmaps/emotes/small/16/cold.png
added pidgin/pixmaps/emotes/small/16/drool.png
added pidgin/pixmaps/emotes/small/16/excruciating.png
added pidgin/pixmaps/emotes/small/16/eyeroll.png
added pidgin/pixmaps/emotes/small/16/girl.png
added pidgin/pixmaps/emotes/small/16/lamp.png
added pidgin/pixmaps/emotes/small/16/lying.png
added pidgin/pixmaps/emotes/small/16/mrgreen.png
added pidgin/pixmaps/emotes/small/16/pirate.png
added pidgin/pixmaps/emotes/small/16/pissed-off.png
added pidgin/pixmaps/emotes/small/16/rose.png
added pidgin/pixmaps/emotes/small/16/shut-mouth.png
added pidgin/pixmaps/emotes/small/16/star.png
added pidgin/pixmaps/emotes/small/16/stressed.png
added share/ca-certs/ValiCert_Class_2_VA.pem
patched COPYRIGHT
patched ChangeLog
patched ChangeLog.API
patched ChangeLog.win32
patched NEWS
patched configure.ac
patched libpurple/debug.h
patched libpurple/plugins/perl/common/Log.xs
patched libpurple/protocols/jabber/chat.c
patched libpurple/protocols/jabber/jabber.c
patched libpurple/protocols/jabber/message.c
patched libpurple/protocols/msn/msn.c
patched libpurple/protocols/msn/object.c
patched libpurple/protocols/msn/object.h
patched libpurple/protocols/msn/session.c
patched libpurple/protocols/msn/session.h
patched libpurple/protocols/msn/slp.c
patched libpurple/protocols/msn/soap.c
patched libpurple/protocols/mxit/actions.c
patched libpurple/protocols/mxit/http.c
patched libpurple/protocols/mxit/login.c
patched libpurple/protocols/mxit/markup.c
patched libpurple/protocols/mxit/multimx.c
patched libpurple/protocols/mxit/mxit.c
patched libpurple/protocols/mxit/mxit.h
patched libpurple/protocols/mxit/profile.c
patched libpurple/protocols/mxit/profile.h
patched libpurple/protocols/mxit/protocol.c
patched libpurple/protocols/mxit/protocol.h
patched libpurple/protocols/mxit/roster.c
patched libpurple/protocols/mxit/roster.h
patched libpurple/protocols/oscar/family_icbm.c
patched libpurple/protocols/oscar/oscar.c
patched libpurple/protocols/yahoo/libymsg.c
patched libpurple/purple-url-handler
patched pidgin/gtkdialogs.c
patched pidgin/gtkmedia.c
patched pidgin/gtkutils.h
patched pidgin/pixmaps/emotes/default/24/Makefile.am
patched pidgin/pixmaps/emotes/default/24/default.theme.in
patched pidgin/pixmaps/emotes/small/16/Makefile.am
patched pidgin/pixmaps/emotes/small/16/amorous.png
patched pidgin/pixmaps/emotes/small/16/embarrassed.png
patched pidgin/pixmaps/emotes/small/16/excited.png
patched pidgin/pixmaps/emotes/small/16/hungry.png
patched pidgin/pixmaps/emotes/small/16/sleeping.png
patched pidgin/pixmaps/emotes/small/16/small.theme.in
patched pidgin/win32/nsis/nsis_translations.desktop.in
patched pidgin/win32/nsis/pidgin-installer.nsi
patched po/ChangeLog
patched po/af.po
patched po/am.po
patched po/ar.po
patched po/as.po
patched po/az.po
patched po/be at latin.po
patched po/bg.po
patched po/bn.po
patched po/bn_IN.po
patched po/bs.po
patched po/ca.po
patched po/ca at valencia.po
patched po/cs.po
patched po/da.po
patched po/de.po
patched po/dz.po
patched po/el.po
patched po/en_AU.po
patched po/en_CA.po
patched po/en_GB.po
patched po/eo.po
patched po/es.po
patched po/et.po
patched po/eu.po
patched po/fa.po
patched po/fi.po
patched po/fr.po
patched po/ga.po
patched po/gl.po
patched po/gu.po
patched po/he.po
patched po/hi.po
patched po/hu.po
patched po/hy.po
patched po/id.po
patched po/it.po
patched po/ja.po
patched po/ka.po
patched po/km.po
patched po/kn.po
patched po/ko.po
patched po/ku.po
patched po/lo.po
patched po/lt.po
patched po/mk.po
patched po/ml.po
patched po/mn.po
patched po/mr.po
patched po/ms_MY.po
patched po/my_MM.po
patched po/nb.po
patched po/ne.po
patched po/nl.po
patched po/nn.po
patched po/oc.po
patched po/or.po
patched po/pa.po
patched po/pl.po
patched po/ps.po
patched po/pt.po
patched po/pt_BR.po
patched po/ro.po
patched po/ru.po
patched po/si.po
patched po/sk.po
patched po/sl.po
patched po/sq.po
patched po/sr.po
patched po/sr at latin.po
patched po/sv.po
patched po/sw.po
patched po/ta.po
patched po/te.po
patched po/th.po
patched po/tr.po
patched po/uk.po
patched po/ur.po
patched po/vi.po
patched po/xh.po
patched po/zh_CN.po
patched po/zh_HK.po
patched po/zh_TW.po
patched share/ca-certs/Makefile.am
attr on pidgin/pixmaps/emotes/default/24/bored.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/default/24/cold.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/default/24/stressed.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/bored.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/boy.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/chilli.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/cold.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/drool.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/excruciating.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/eyeroll.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/girl.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/lamp.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/lying.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/mrgreen.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/pirate.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/pissed-off.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/rose.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/shut-mouth.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/star.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/stressed.png
set mtn:manual_merge
to true
More information about the Commits
mailing list