soc.2010.icq-tlc: 9fb2d8c3: propagate from branch 'im.pidgin.pidgin'...
markdoliner at pidgin.im
markdoliner at pidgin.im
Thu Aug 12 11:36:11 EDT 2010
----------------------------------------------------------------------
Revision: 9fb2d8c372e71e1177c4aba8782147d4137ae533
Parent: 4c9bb4231e46e234d01e6dc64bf4be49fb12c27c
Parent: 9166d0ffe82472b17cee09aabbef61d8ec6e3e44
Author: markdoliner at pidgin.im
Date: 08/12/10 11:30:11
Branch: im.pidgin.soc.2010.icq-tlc
URL: http://d.pidgin.im/viewmtn/revision/info/9fb2d8c372e71e1177c4aba8782147d4137ae533
Changelog:
propagate from branch 'im.pidgin.pidgin' (head 9166d0ffe82472b17cee09aabbef61d8ec6e3e44)
to branch 'im.pidgin.soc.2010.icq-tlc' (head 4c9bb4231e46e234d01e6dc64bf4be49fb12c27c)
Changes against parent 4c9bb4231e46e234d01e6dc64bf4be49fb12c27c
added libpurple/tests/test_jabber_caps.c
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 Makefile.am
patched NEWS
patched configure.ac
patched doc/finch.1.in
patched finch/finch.c
patched finch/gntaccount.c
patched finch/gntdebug.c
patched finch/gntrequest.c
patched finch/gntsound.c
patched finch/libgnt/configure.ac
patched finch/libgnt/gntbox.c
patched finch/libgnt/gntcombobox.c
patched finch/libgnt/gntentry.c
patched finch/libgnt/gnttree.c
patched finch/libgnt/gnttree.h
patched finch/libgnt/gntutils.c
patched libpurple/Makefile.am
patched libpurple/account.c
patched libpurple/certificate.c
patched libpurple/connection.c
patched libpurple/debug.h
patched libpurple/media/backend-fs2.c
patched libpurple/network.c
patched libpurple/plugins/Makefile.mingw
patched libpurple/plugins/perl/common/Log.xs
patched libpurple/protocols/gg/lib/resolver.c
patched libpurple/protocols/irc/cmds.c
patched libpurple/protocols/jabber/auth_cyrus.c
patched libpurple/protocols/jabber/bosh.c
patched libpurple/protocols/jabber/caps.c
patched libpurple/protocols/jabber/caps.h
patched libpurple/protocols/jabber/chat.c
patched libpurple/protocols/jabber/data.c
patched libpurple/protocols/jabber/jabber.c
patched libpurple/protocols/jabber/jabber.h
patched libpurple/protocols/jabber/jutil.c
patched libpurple/protocols/jabber/message.c
patched libpurple/protocols/jabber/namespaces.h
patched libpurple/protocols/jabber/si.c
patched libpurple/protocols/jabber/xdata.c
patched libpurple/protocols/jabber/xdata.h
patched libpurple/protocols/msn/directconn.h
patched libpurple/protocols/msn/msn.c
patched libpurple/protocols/msn/notification.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/slplink.c
patched libpurple/protocols/msn/soap.c
patched libpurple/protocols/msn/switchboard.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/util.c
patched libpurple/protocols/yahoo/libyahoo.c
patched libpurple/protocols/yahoo/libyahoojp.c
patched libpurple/protocols/yahoo/libymsg.c
patched libpurple/protocols/yahoo/libymsg.h
patched libpurple/protocols/yahoo/util.c
patched libpurple/protocols/yahoo/yahoo_filexfer.c
patched libpurple/protocols/zephyr/ZVariables.c
patched libpurple/purple-url-handler
patched libpurple/tests/Makefile.am
patched libpurple/tests/check_libpurple.c
patched libpurple/tests/test_jabber_scram.c
patched libpurple/tests/test_util.c
patched libpurple/tests/tests.h
patched libpurple/upnp.c
patched libpurple/util.c
patched libpurple/xmlnode.c
patched libpurple/xmlnode.h
patched pidgin/Makefile.mingw
patched pidgin/gtkblist.c
patched pidgin/gtkdialogs.c
patched pidgin/gtkimhtml.c
patched pidgin/gtkimhtmltoolbar.c
patched pidgin/gtkmain.c
patched pidgin/gtkmedia.c
patched pidgin/gtkprefs.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/pixmaps/pidgin.ico
patched pidgin/plugins/Makefile.mingw
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
Changes against parent 9166d0ffe82472b17cee09aabbef61d8ec6e3e44
dropped libpurple/protocols/oscar/family_advert.c
dropped libpurple/protocols/oscar/family_invite.c
dropped libpurple/protocols/oscar/family_odir.c
dropped libpurple/protocols/oscar/family_translate.c
added libpurple/protocols/oscar/authorization.c
added libpurple/protocols/oscar/encoding.c
added libpurple/protocols/oscar/encoding.h
added libpurple/protocols/oscar/userinfo.c
added libpurple/protocols/oscar/visibility.c
added libpurple/protocols/oscar/visibility.h
patched libpurple/protocols/oscar/Makefile.am
patched libpurple/protocols/oscar/bstream.c
patched libpurple/protocols/oscar/family_admin.c
patched libpurple/protocols/oscar/family_alert.c
patched libpurple/protocols/oscar/family_auth.c
patched libpurple/protocols/oscar/family_bart.c
patched libpurple/protocols/oscar/family_bos.c
patched libpurple/protocols/oscar/family_buddy.c
patched libpurple/protocols/oscar/family_chat.c
patched libpurple/protocols/oscar/family_chatnav.c
patched libpurple/protocols/oscar/family_feedbag.c
patched libpurple/protocols/oscar/family_icbm.c
patched libpurple/protocols/oscar/family_icq.c
patched libpurple/protocols/oscar/family_locate.c
patched libpurple/protocols/oscar/family_oservice.c
patched libpurple/protocols/oscar/family_userlookup.c
patched libpurple/protocols/oscar/flap_connection.c
patched libpurple/protocols/oscar/libaim.c
patched libpurple/protocols/oscar/libicq.c
patched libpurple/protocols/oscar/misc.c
patched libpurple/protocols/oscar/msgcookie.c
patched libpurple/protocols/oscar/odc.c
patched libpurple/protocols/oscar/oscar.c
patched libpurple/protocols/oscar/oscar.h
patched libpurple/protocols/oscar/oscar_data.c
patched libpurple/protocols/oscar/oscarcommon.h
patched libpurple/protocols/oscar/peer_proxy.c
patched libpurple/protocols/oscar/rxhandlers.c
patched libpurple/protocols/oscar/snac.c
patched libpurple/protocols/oscar/tlv.c
patched libpurple/protocols/oscar/util.c
patched pidgin/gtkaccount.c
patched pidgin/gtkutils.c
patched pidgin/gtkutils.h
patched pidgin/minidialog.c
patched pidgin/minidialog.h
More information about the Commits
mailing list