cpw.darkrain42.xmpp.bosh: 92d6837c: explicit merge of '714a7c7f903d11c96ffad...
paul at darkrain42.org
paul at darkrain42.org
Sat Jan 17 23:56:39 EST 2009
-----------------------------------------------------------------
Revision: 92d6837c02024957e64a843d1b409cf944cc89fc
Ancestor: 714a7c7f903d11c96ffade34966121da549d998f
Ancestor: d2c40fe4e2181eda5c1c631c7805f17e6b5d22c3
Author: paul at darkrain42.org
Date: 2008-11-20T21:13:56
Branch: im.pidgin.cpw.darkrain42.xmpp.bosh
URL: http://d.pidgin.im/viewmtn/revision/info/92d6837c02024957e64a843d1b409cf944cc89fc
Deleted entries:
libpurple/protocols/msn/slpsession.c
libpurple/protocols/msn/slpsession.h
libpurple/protocols/msn/soap.c
libpurple/protocols/msn/soap.h
libpurple/protocols/qq/buddy_status.c
libpurple/protocols/qq/buddy_status.h
libpurple/protocols/qq/keep_alive.c
libpurple/protocols/qq/keep_alive.h
libpurple/protocols/qq/login_logout.c
libpurple/protocols/qq/login_logout.h
libpurple/protocols/qq/qq_proxy.c
libpurple/protocols/qq/qq_proxy.h
libpurple/protocols/qq/recv_core.c
libpurple/protocols/qq/recv_core.h
libpurple/protocols/qq/send_core.c
libpurple/protocols/qq/send_core.h
libpurple/protocols/qq/sendqueue.c
libpurple/protocols/qq/sendqueue.h
libpurple/protocols/qq/udp_proxy_s5.c
libpurple/protocols/qq/udp_proxy_s5.h
Renamed entries:
libpurple/protocols/msn/soap2.c to libpurple/protocols/msn/soap.c
libpurple/protocols/msn/soap2.h to libpurple/protocols/msn/soap.h
Added files:
doc/cmd-signals.dox libpurple/protocols/qq/ChangeLog
libpurple/protocols/qq/qq_base.c
libpurple/protocols/qq/qq_base.h
libpurple/protocols/qq/qq_network.c
libpurple/protocols/qq/qq_network.h
libpurple/protocols/qq/qq_process.c
libpurple/protocols/qq/qq_process.h
libpurple/protocols/qq/qq_trans.c
libpurple/protocols/qq/qq_trans.h
pidgin/pixmaps/emblems/16/scalable/birthday.svg
pidgin/pixmaps/emotes/default/24/bunny.png
share/ca-certs/CAcert_Class3.pem
share/ca-certs/CAcert_Root.pem
Modified files:
AUTHORS COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
NEWS configure.ac doc/connection-signals.dox
doc/funniest_home_convos.txt doc/pidgin.1.in finch/finch.c
finch/gntconv.c finch/libgnt/gntbutton.c
finch/libgnt/gntkeys.c libpurple/blist.h libpurple/cipher.c
libpurple/cmds.c libpurple/cmds.h libpurple/connection.h
libpurple/conversation.c libpurple/conversation.h
libpurple/core.c libpurple/core.h libpurple/idle.c
libpurple/internal.h libpurple/log.c libpurple/nat-pmp.c
libpurple/plugin.h libpurple/plugins/autoaccept.c
libpurple/plugins/perl/Makefile.mingw
libpurple/plugins/perl/common/Makefile.mingw
libpurple/plugins/perl/common/Prefs.xs
libpurple/plugins/perl/perl-common.c
libpurple/plugins/perl/perl-common.h
libpurple/plugins/perl/perl-handlers.c
libpurple/plugins/perl/perl-handlers.h
libpurple/plugins/perl/perl.c
libpurple/plugins/perl/scripts/plugin_pref.pl
libpurple/protocols/bonjour/bonjour.c
libpurple/protocols/bonjour/bonjour_ft.c
libpurple/protocols/bonjour/jabber.c
libpurple/protocols/gg/gg.c libpurple/protocols/gg/search.h
libpurple/protocols/irc/cmds.c libpurple/protocols/irc/irc.c
libpurple/protocols/irc/irc.h libpurple/protocols/irc/msgs.c
libpurple/protocols/irc/parse.c
libpurple/protocols/jabber/Makefile.am
libpurple/protocols/jabber/Makefile.mingw
libpurple/protocols/jabber/bosh.c
libpurple/protocols/jabber/bosh.h
libpurple/protocols/jabber/buddy.c
libpurple/protocols/jabber/buddy.h
libpurple/protocols/jabber/caps.h
libpurple/protocols/jabber/chat.c
libpurple/protocols/jabber/disco.c
libpurple/protocols/jabber/google.c
libpurple/protocols/jabber/jabber.c
libpurple/protocols/jabber/jabber.h
libpurple/protocols/jabber/libxmpp.c
libpurple/protocols/jabber/parser.c
libpurple/protocols/jabber/pep.h
libpurple/protocols/jabber/presence.c
libpurple/protocols/jabber/roster.c
libpurple/protocols/jabber/si.c
libpurple/protocols/msn/Makefile.am
libpurple/protocols/msn/Makefile.mingw
libpurple/protocols/msn/cmdproc.c
libpurple/protocols/msn/command.c
libpurple/protocols/msn/contact.c
libpurple/protocols/msn/contact.h
libpurple/protocols/msn/group.h
libpurple/protocols/msn/httpconn.c
libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h
libpurple/protocols/msn/msnutils.c
libpurple/protocols/msn/nexus.c
libpurple/protocols/msn/nexus.h
libpurple/protocols/msn/notification.c
libpurple/protocols/msn/notification.h
libpurple/protocols/msn/oim.c libpurple/protocols/msn/oim.h
libpurple/protocols/msn/page.c
libpurple/protocols/msn/servconn.c
libpurple/protocols/msn/servconn.h
libpurple/protocols/msn/session.c
libpurple/protocols/msn/session.h
libpurple/protocols/msn/slp.c
libpurple/protocols/msn/slpcall.c
libpurple/protocols/msn/slpcall.h
libpurple/protocols/msn/slplink.c
libpurple/protocols/msn/slplink.h
libpurple/protocols/msn/slpmsg.h
libpurple/protocols/msn/soap.c
libpurple/protocols/msn/soap.h
libpurple/protocols/msn/state.c
libpurple/protocols/msn/switchboard.c
libpurple/protocols/msn/sync.c
libpurple/protocols/msn/user.c
libpurple/protocols/msn/user.h
libpurple/protocols/msn/userlist.c
libpurple/protocols/msnp9/command.c
libpurple/protocols/msnp9/servconn.c
libpurple/protocols/msnp9/slplink.c
libpurple/protocols/myspace/user.c
libpurple/protocols/oscar/family_auth.c
libpurple/protocols/oscar/family_icq.c
libpurple/protocols/oscar/family_locate.c
libpurple/protocols/oscar/family_oservice.c
libpurple/protocols/oscar/flap_connection.c
libpurple/protocols/oscar/oscar.c
libpurple/protocols/oscar/oscar.h
libpurple/protocols/oscar/oscar_data.c
libpurple/protocols/qq/AUTHORS
libpurple/protocols/qq/Makefile.am
libpurple/protocols/qq/Makefile.mingw
libpurple/protocols/qq/buddy_info.c
libpurple/protocols/qq/buddy_info.h
libpurple/protocols/qq/buddy_list.c
libpurple/protocols/qq/buddy_list.h
libpurple/protocols/qq/buddy_opt.c
libpurple/protocols/qq/char_conv.c
libpurple/protocols/qq/char_conv.h
libpurple/protocols/qq/crypt.c
libpurple/protocols/qq/crypt.h
libpurple/protocols/qq/file_trans.c
libpurple/protocols/qq/group_conv.c
libpurple/protocols/qq/group_find.c
libpurple/protocols/qq/group_free.c
libpurple/protocols/qq/group_im.c
libpurple/protocols/qq/group_im.h
libpurple/protocols/qq/group_info.c
libpurple/protocols/qq/group_info.h
libpurple/protocols/qq/group_join.c
libpurple/protocols/qq/group_join.h
libpurple/protocols/qq/group_network.c
libpurple/protocols/qq/group_network.h
libpurple/protocols/qq/group_opt.c
libpurple/protocols/qq/group_opt.h
libpurple/protocols/qq/group_search.c
libpurple/protocols/qq/group_search.h
libpurple/protocols/qq/header_info.c
libpurple/protocols/qq/header_info.h
libpurple/protocols/qq/im.c
libpurple/protocols/qq/packet_parse.c
libpurple/protocols/qq/packet_parse.h
libpurple/protocols/qq/qq.c libpurple/protocols/qq/qq.h
libpurple/protocols/qq/send_file.c
libpurple/protocols/qq/send_file.h
libpurple/protocols/qq/sys_msg.c
libpurple/protocols/qq/utils.c
libpurple/protocols/qq/utils.h
libpurple/protocols/silc/buddy.c
libpurple/protocols/silc/silc.c
libpurple/protocols/silc10/buddy.c
libpurple/protocols/silc10/silc.c
libpurple/protocols/simple/simple.c
libpurple/protocols/yahoo/yahoo.c
libpurple/protocols/yahoo/yahoo_profile.c libpurple/prpl.c
libpurple/prpl.h libpurple/purple-url-handler
libpurple/roomlist.h libpurple/server.c libpurple/server.h
libpurple/sound.h libpurple/util.c libpurple/util.h
libpurple/win32/global.mak libpurple/win32/libc_interface.c
libpurple/xmlnode.c pidgin/gtkaccount.c pidgin/gtkblist.c
pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkdocklet.c
pidgin/gtkimhtml.c pidgin/gtkmain.c pidgin/gtkmenutray.c
pidgin/gtkroomlist.c pidgin/gtksmiley.c pidgin/gtkutils.c
pidgin/pidgintooltip.c
pidgin/pixmaps/emblems/16/birthday.png
pidgin/pixmaps/emotes/default/24/Makefile.am
pidgin/pixmaps/emotes/default/24/airplane.png
pidgin/pixmaps/emotes/default/24/bad.png
pidgin/pixmaps/emotes/default/24/beer.png
pidgin/pixmaps/emotes/default/24/bomb.png
pidgin/pixmaps/emotes/default/24/bowl.png
pidgin/pixmaps/emotes/default/24/boy.png
pidgin/pixmaps/emotes/default/24/brb.png
pidgin/pixmaps/emotes/default/24/cake.png
pidgin/pixmaps/emotes/default/24/camera.png
pidgin/pixmaps/emotes/default/24/car.png
pidgin/pixmaps/emotes/default/24/cat.png
pidgin/pixmaps/emotes/default/24/clock.png
pidgin/pixmaps/emotes/default/24/coffee.png
pidgin/pixmaps/emotes/default/24/coins.png
pidgin/pixmaps/emotes/default/24/console.png
pidgin/pixmaps/emotes/default/24/default.theme.in
pidgin/pixmaps/emotes/default/24/dog.png
pidgin/pixmaps/emotes/default/24/drink.png
pidgin/pixmaps/emotes/default/24/film.png
pidgin/pixmaps/emotes/default/24/girl.png
pidgin/pixmaps/emotes/default/24/goat.png
pidgin/pixmaps/emotes/default/24/good.png
pidgin/pixmaps/emotes/default/24/handcuffs.png
pidgin/pixmaps/emotes/default/24/lamp.png
pidgin/pixmaps/emotes/default/24/love-over.png
pidgin/pixmaps/emotes/default/24/love.png
pidgin/pixmaps/emotes/default/24/mail.png
pidgin/pixmaps/emotes/default/24/mobile.png
pidgin/pixmaps/emotes/default/24/moon.png
pidgin/pixmaps/emotes/default/24/msn.png
pidgin/pixmaps/emotes/default/24/musical-note.png
pidgin/pixmaps/emotes/default/24/phone.png
pidgin/pixmaps/emotes/default/24/pizza.png
pidgin/pixmaps/emotes/default/24/plate.png
pidgin/pixmaps/emotes/default/24/present.png
pidgin/pixmaps/emotes/default/24/rain.png
pidgin/pixmaps/emotes/default/24/rose-dead.png
pidgin/pixmaps/emotes/default/24/rose.png
pidgin/pixmaps/emotes/default/24/sheep.png
pidgin/pixmaps/emotes/default/24/soccerball.png
pidgin/pixmaps/emotes/default/24/star.png
pidgin/pixmaps/emotes/default/24/sun.png
pidgin/pixmaps/emotes/default/24/thunder.png
pidgin/pixmaps/emotes/default/24/turtle.png
pidgin/pixmaps/emotes/default/24/umbrella.png
pidgin/pixmaps/toolbar/16/emote-select.png
pidgin/pixmaps/toolbar/16/scalable/emote-select.svg
pidgin/pixmaps/tray/22/tray-away.png
pidgin/pixmaps/tray/22/tray-busy.png
pidgin/pixmaps/tray/22/tray-online.png
pidgin/plugins/cap/cap.c
pidgin/plugins/perl/common/Makefile.mingw
pidgin/win32/nsis/pidgin-installer.nsi
pidgin/win32/winpidgin.c po/POTFILES.in po/de.po po/en_GB.po
po/it.po po/nb.po po/te.po po/ur.po po/vi.po po/zh_CN.po
po/zh_TW.po share/ca-certs/Makefile.am
Modified attrs:
pidgin/pixmaps/emotes/default/24/bunny.png
ChangeLog:
explicit merge of '714a7c7f903d11c96ffade34966121da549d998f'
and 'd2c40fe4e2181eda5c1c631c7805f17e6b5d22c3'
to branch 'org.darkrain42.pidgin.xmpp'
More information about the Commits
mailing list