maiku.vv: d40ae24f: merge of 'a4aa548f12b557cc419b1567e6902e...
maiku at soc.pidgin.im
maiku at soc.pidgin.im
Sun Oct 19 01:13:31 EDT 2008
-----------------------------------------------------------------
Revision: d40ae24f7705b8f2f6dc4334b02a00f7b9cd5ac7
Ancestor: a4aa548f12b557cc419b1567e6902eb124d0cf06
Ancestor: c2b27ebb3760df28827d2fd1b391386a894cf952
Author: maiku at soc.pidgin.im
Date: 2008-10-19T04:40:59
Branch: im.pidgin.maiku.vv
URL: http://d.pidgin.im/viewmtn/revision/info/d40ae24f7705b8f2f6dc4334b02a00f7b9cd5ac7
Deleted entries:
pidgin/pixmaps/buddy_icons pidgin/pixmaps/buddy_icons/qq
pidgin/pixmaps/buddy_icons/qq/Makefile.am
pidgin/pixmaps/buddy_icons/qq/Makefile.mingw
pidgin/pixmaps/buddy_icons/qq/qq_1.png
pidgin/pixmaps/buddy_icons/qq/qq_10.png
pidgin/pixmaps/buddy_icons/qq/qq_100.png
pidgin/pixmaps/buddy_icons/qq/qq_11.png
pidgin/pixmaps/buddy_icons/qq/qq_12.png
pidgin/pixmaps/buddy_icons/qq/qq_13.png
pidgin/pixmaps/buddy_icons/qq/qq_14.png
pidgin/pixmaps/buddy_icons/qq/qq_15.png
pidgin/pixmaps/buddy_icons/qq/qq_16.png
pidgin/pixmaps/buddy_icons/qq/qq_17.png
pidgin/pixmaps/buddy_icons/qq/qq_18.png
pidgin/pixmaps/buddy_icons/qq/qq_19.png
pidgin/pixmaps/buddy_icons/qq/qq_2.png
pidgin/pixmaps/buddy_icons/qq/qq_20.png
pidgin/pixmaps/buddy_icons/qq/qq_21.png
pidgin/pixmaps/buddy_icons/qq/qq_22.png
pidgin/pixmaps/buddy_icons/qq/qq_23.png
pidgin/pixmaps/buddy_icons/qq/qq_24.png
pidgin/pixmaps/buddy_icons/qq/qq_25.png
pidgin/pixmaps/buddy_icons/qq/qq_26.png
pidgin/pixmaps/buddy_icons/qq/qq_27.png
pidgin/pixmaps/buddy_icons/qq/qq_28.png
pidgin/pixmaps/buddy_icons/qq/qq_29.png
pidgin/pixmaps/buddy_icons/qq/qq_3.png
pidgin/pixmaps/buddy_icons/qq/qq_30.png
pidgin/pixmaps/buddy_icons/qq/qq_31.png
pidgin/pixmaps/buddy_icons/qq/qq_32.png
pidgin/pixmaps/buddy_icons/qq/qq_33.png
pidgin/pixmaps/buddy_icons/qq/qq_34.png
pidgin/pixmaps/buddy_icons/qq/qq_35.png
pidgin/pixmaps/buddy_icons/qq/qq_36.png
pidgin/pixmaps/buddy_icons/qq/qq_37.png
pidgin/pixmaps/buddy_icons/qq/qq_38.png
pidgin/pixmaps/buddy_icons/qq/qq_39.png
pidgin/pixmaps/buddy_icons/qq/qq_4.png
pidgin/pixmaps/buddy_icons/qq/qq_40.png
pidgin/pixmaps/buddy_icons/qq/qq_41.png
pidgin/pixmaps/buddy_icons/qq/qq_42.png
pidgin/pixmaps/buddy_icons/qq/qq_43.png
pidgin/pixmaps/buddy_icons/qq/qq_44.png
pidgin/pixmaps/buddy_icons/qq/qq_45.png
pidgin/pixmaps/buddy_icons/qq/qq_46.png
pidgin/pixmaps/buddy_icons/qq/qq_47.png
pidgin/pixmaps/buddy_icons/qq/qq_48.png
pidgin/pixmaps/buddy_icons/qq/qq_49.png
pidgin/pixmaps/buddy_icons/qq/qq_5.png
pidgin/pixmaps/buddy_icons/qq/qq_50.png
pidgin/pixmaps/buddy_icons/qq/qq_51.png
pidgin/pixmaps/buddy_icons/qq/qq_52.png
pidgin/pixmaps/buddy_icons/qq/qq_53.png
pidgin/pixmaps/buddy_icons/qq/qq_54.png
pidgin/pixmaps/buddy_icons/qq/qq_55.png
pidgin/pixmaps/buddy_icons/qq/qq_56.png
pidgin/pixmaps/buddy_icons/qq/qq_57.png
pidgin/pixmaps/buddy_icons/qq/qq_58.png
pidgin/pixmaps/buddy_icons/qq/qq_59.png
pidgin/pixmaps/buddy_icons/qq/qq_6.png
pidgin/pixmaps/buddy_icons/qq/qq_60.png
pidgin/pixmaps/buddy_icons/qq/qq_61.png
pidgin/pixmaps/buddy_icons/qq/qq_62.png
pidgin/pixmaps/buddy_icons/qq/qq_63.png
pidgin/pixmaps/buddy_icons/qq/qq_64.png
pidgin/pixmaps/buddy_icons/qq/qq_65.png
pidgin/pixmaps/buddy_icons/qq/qq_66.png
pidgin/pixmaps/buddy_icons/qq/qq_67.png
pidgin/pixmaps/buddy_icons/qq/qq_68.png
pidgin/pixmaps/buddy_icons/qq/qq_69.png
pidgin/pixmaps/buddy_icons/qq/qq_7.png
pidgin/pixmaps/buddy_icons/qq/qq_70.png
pidgin/pixmaps/buddy_icons/qq/qq_71.png
pidgin/pixmaps/buddy_icons/qq/qq_72.png
pidgin/pixmaps/buddy_icons/qq/qq_73.png
pidgin/pixmaps/buddy_icons/qq/qq_74.png
pidgin/pixmaps/buddy_icons/qq/qq_75.png
pidgin/pixmaps/buddy_icons/qq/qq_76.png
pidgin/pixmaps/buddy_icons/qq/qq_77.png
pidgin/pixmaps/buddy_icons/qq/qq_78.png
pidgin/pixmaps/buddy_icons/qq/qq_79.png
pidgin/pixmaps/buddy_icons/qq/qq_8.png
pidgin/pixmaps/buddy_icons/qq/qq_80.png
pidgin/pixmaps/buddy_icons/qq/qq_81.png
pidgin/pixmaps/buddy_icons/qq/qq_82.png
pidgin/pixmaps/buddy_icons/qq/qq_83.png
pidgin/pixmaps/buddy_icons/qq/qq_84.png
pidgin/pixmaps/buddy_icons/qq/qq_85.png
pidgin/pixmaps/buddy_icons/qq/qq_86.png
pidgin/pixmaps/buddy_icons/qq/qq_87.png
pidgin/pixmaps/buddy_icons/qq/qq_88.png
pidgin/pixmaps/buddy_icons/qq/qq_89.png
pidgin/pixmaps/buddy_icons/qq/qq_9.png
pidgin/pixmaps/buddy_icons/qq/qq_90.png
pidgin/pixmaps/buddy_icons/qq/qq_91.png
pidgin/pixmaps/buddy_icons/qq/qq_92.png
pidgin/pixmaps/buddy_icons/qq/qq_93.png
pidgin/pixmaps/buddy_icons/qq/qq_94.png
pidgin/pixmaps/buddy_icons/qq/qq_95.png
pidgin/pixmaps/buddy_icons/qq/qq_96.png
pidgin/pixmaps/buddy_icons/qq/qq_97.png
pidgin/pixmaps/buddy_icons/qq/qq_98.png
pidgin/pixmaps/buddy_icons/qq/qq_99.png
Renamed entries:
libpurple/protocols/jabber/jingle.c to libpurple/protocols/jabber/jingle/jingle.c
libpurple/protocols/jabber/jingle.h to libpurple/protocols/jabber/jingle/jingle.h
Added files:
libpurple/protocols/jabber/data.c
libpurple/protocols/jabber/data.h
libpurple/protocols/jabber/jingle/content.c
libpurple/protocols/jabber/jingle/content.h
libpurple/protocols/jabber/jingle/session.c
libpurple/protocols/jabber/jingle/session.h
libpurple/protocols/jabber/jingle/transport.c
libpurple/protocols/jabber/jingle/transport.h
pidgin/pidginstock-artwork.c po/ga.po
Added directories:
libpurple/protocols/jabber/jingle
Modified files:
.mtn-ignore AUTHORS COPYRIGHT ChangeLog ChangeLog.win32
Makefile.mingw NEWS configure.ac
doc/funniest_home_convos.txt doc/pidgin.1.in
finch/gntaccount.c finch/gntblist.c finch/gntnotify.c
finch/gntpounce.c finch/libgnt/gntkeys.c
finch/libgnt/gntmenu.c finch/libgnt/wms/Makefile.am
finch/plugins/Makefile.am finch/plugins/grouping.c
libpurple/account.c libpurple/buddyicon.c
libpurple/buddyicon.h libpurple/dbus-maybe.h
libpurple/dnsquery.c libpurple/marshallers.list
libpurple/media.c libpurple/media.h libpurple/mediamanager.h
libpurple/plugins/Makefile.am libpurple/plugins/autoaccept.c
libpurple/plugins/log_reader.c libpurple/plugins/perl/perl.c
libpurple/plugins/ssl/ssl-nss.c
libpurple/protocols/bonjour/jabber.c
libpurple/protocols/jabber/Makefile.am
libpurple/protocols/jabber/Makefile.mingw
libpurple/protocols/jabber/buddy.c
libpurple/protocols/jabber/buddy.h
libpurple/protocols/jabber/chat.c
libpurple/protocols/jabber/disco.c
libpurple/protocols/jabber/iq.c
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/message.c
libpurple/protocols/jabber/message.h
libpurple/protocols/jabber/roster.c
libpurple/protocols/msn/error.c
libpurple/protocols/msn/group.h
libpurple/protocols/msn/msn.c
libpurple/protocols/msn/notification.c
libpurple/protocols/msn/session.c
libpurple/protocols/msn/soap.c
libpurple/protocols/msn/switchboard.c
libpurple/protocols/null/nullprpl.c
libpurple/protocols/oscar/flap_connection.c
libpurple/protocols/oscar/libicq.c
libpurple/protocols/oscar/oscar.c
libpurple/protocols/qq/AUTHORS
libpurple/protocols/qq/ChangeLog
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/file_trans.c
libpurple/protocols/qq/group.c
libpurple/protocols/qq/group.h
libpurple/protocols/qq/group_conv.c
libpurple/protocols/qq/group_conv.h
libpurple/protocols/qq/group_find.c
libpurple/protocols/qq/group_find.h
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_internal.c
libpurple/protocols/qq/group_internal.h
libpurple/protocols/qq/group_join.c
libpurple/protocols/qq/group_join.h
libpurple/protocols/qq/group_opt.c
libpurple/protocols/qq/group_opt.h
libpurple/protocols/qq/group_search.c
libpurple/protocols/qq/header_info.c
libpurple/protocols/qq/header_info.h
libpurple/protocols/qq/im.c libpurple/protocols/qq/im.h
libpurple/protocols/qq/packet_parse.c
libpurple/protocols/qq/qq.c libpurple/protocols/qq/qq.h
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
libpurple/protocols/qq/send_file.c
libpurple/protocols/qq/sys_msg.c
libpurple/protocols/qq/utils.c
libpurple/protocols/qq/utils.h
libpurple/protocols/yahoo/yahoo.c
libpurple/protocols/yahoo/yahoo.h
libpurple/protocols/yahoo/yahoo_auth.c
libpurple/protocols/yahoo/yahoo_auth.h
libpurple/protocols/yahoo/yahoo_packet.h
libpurple/protocols/yahoo/yahoochat.c libpurple/proxy.c
libpurple/sslconn.h libpurple/util.c
libpurple/win32/giowin32.c libpurple/win32/libc_interface.h
libpurple/win32/libc_internal.h libpurple/win32/win32dep.h
pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdialogs.c
pidgin/gtkimhtml.c pidgin/gtkimhtmltoolbar.c
pidgin/gtkmedia.c pidgin/gtkmenutray.c pidgin/gtknotify.c
pidgin/gtkprefs.c pidgin/gtksmiley.c pidgin/gtkstatusbox.c
pidgin/pixmaps/Makefile.am pidgin/pixmaps/Makefile.mingw
pidgin/pixmaps/emotes/default/24/Makefile.mingw
pidgin/pixmaps/emotes/none/Makefile.mingw
pidgin/plugins/Makefile.am pidgin/plugins/Makefile.mingw
pidgin/plugins/pidginrc.c pidgin/plugins/relnot.c
pidgin/win32/nsis/pidgin-installer.nsi pidgin.spec.in
po/ChangeLog po/POTFILES.in po/cs.po po/de.po po/es.po
po/fi.po po/gl.po po/he.po po/it.po po/nl.po po/nn.po
po/pt_BR.po po/sv.po po/zh_HK.po po/zh_TW.po
share/ca-certs/Makefile.mingw
ChangeLog:
merge of 'a4aa548f12b557cc419b1567e6902eb124d0cf06'
and 'c2b27ebb3760df28827d2fd1b391386a894cf952'
More information about the Commits
mailing list