adium: e4b8a20e: merge of 'e458e71beb6cabc19c7d0fa57cd3c4...
zacw at adiumx.com
zacw at adiumx.com
Mon Apr 13 23:55:50 EDT 2009
-----------------------------------------------------------------
Revision: e4b8a20e815d101ea0f825432d6ae83f0d2881a4
Ancestor: e458e71beb6cabc19c7d0fa57cd3c4cb699a9b76
Ancestor: f67c49459f7574a42fc6cf309560c54cb58d773c
Author: zacw at adiumx.com
Date: 2009-04-13T23:43:21
Branch: im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/e4b8a20e815d101ea0f825432d6ae83f0d2881a4
Deleted entries:
libpurple/protocols/toc
Added files:
finch/gntmedia.c finch/gntmedia.h
finch/libgnt/gntprogressbar.c finch/libgnt/gntprogressbar.h
finch/plugins/gnttinyurl.c libpurple/marshallers.list
libpurple/media-gst.h libpurple/media.c libpurple/media.h
libpurple/mediamanager.c libpurple/mediamanager.h
libpurple/protocols/jabber/jingle/content.c
libpurple/protocols/jabber/jingle/content.h
libpurple/protocols/jabber/jingle/iceudp.c
libpurple/protocols/jabber/jingle/iceudp.h
libpurple/protocols/jabber/jingle/jingle.c
libpurple/protocols/jabber/jingle/jingle.h
libpurple/protocols/jabber/jingle/rawudp.c
libpurple/protocols/jabber/jingle/rawudp.h
libpurple/protocols/jabber/jingle/rtp.c
libpurple/protocols/jabber/jingle/rtp.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/gtkmedia.c pidgin/gtkmedia.h
pidgin/pixmaps/toolbar/16/audio-call.png
pidgin/pixmaps/toolbar/16/video-call.png
Added directories:
libpurple/protocols/jabber/jingle
Modified files:
COPYRIGHT ChangeLog ChangeLog.API configure.ac
doc/finch.1.in finch/Makefile.am finch/gntaccount.c
finch/gntblist.c finch/gntconv.c finch/gntui.c
finch/libgnt/Makefile.am finch/libgnt/gnt.h
finch/libgnt/gntbox.c finch/libgnt/gntcheckbox.c
finch/libgnt/gntcombobox.c finch/libgnt/gntentry.c
finch/libgnt/gntkeys.h finch/libgnt/gnttextview.c
finch/libgnt/gnttree.c finch/libgnt/gntwm.c
finch/plugins/Makefile.am finch/plugins/gntgf.c
libpurple/Makefile.am libpurple/Makefile.mingw
libpurple/account.c libpurple/blist.c libpurple/blist.h
libpurple/buddyicon.c libpurple/conversation.c
libpurple/conversation.h libpurple/core.c libpurple/ft.c
libpurple/internal.h libpurple/mime.c libpurple/mime.h
libpurple/network.c libpurple/network.h libpurple/plugin.c
libpurple/plugin.h libpurple/plugins/filectl.c
libpurple/plugins/joinpart.c
libpurple/protocols/bonjour/bonjour.c
libpurple/protocols/bonjour/jabber.c
libpurple/protocols/facebook/facebook.nsi
libpurple/protocols/facebook/fb_blist.c
libpurple/protocols/facebook/fb_connection.c
libpurple/protocols/facebook/fb_messages.c
libpurple/protocols/facebook/fb_messages.h
libpurple/protocols/facebook/libfacebook.c
libpurple/protocols/facebook/libfacebook.h
libpurple/protocols/gg/gg.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/adhoccommands.c
libpurple/protocols/jabber/adhoccommands.h
libpurple/protocols/jabber/auth.c
libpurple/protocols/jabber/auth.h
libpurple/protocols/jabber/buddy.c
libpurple/protocols/jabber/buddy.h
libpurple/protocols/jabber/caps.c
libpurple/protocols/jabber/caps.h
libpurple/protocols/jabber/chat.c
libpurple/protocols/jabber/chat.h
libpurple/protocols/jabber/data.c
libpurple/protocols/jabber/data.h
libpurple/protocols/jabber/disco.c
libpurple/protocols/jabber/disco.h
libpurple/protocols/jabber/google.c
libpurple/protocols/jabber/google.h
libpurple/protocols/jabber/ibb.c
libpurple/protocols/jabber/ibb.h
libpurple/protocols/jabber/iq.c
libpurple/protocols/jabber/iq.h
libpurple/protocols/jabber/jabber.c
libpurple/protocols/jabber/jabber.h
libpurple/protocols/jabber/jutil.h
libpurple/protocols/jabber/libxmpp.c
libpurple/protocols/jabber/message.c
libpurple/protocols/jabber/message.h
libpurple/protocols/jabber/oob.c
libpurple/protocols/jabber/oob.h
libpurple/protocols/jabber/parser.h
libpurple/protocols/jabber/pep.c
libpurple/protocols/jabber/pep.h
libpurple/protocols/jabber/ping.c
libpurple/protocols/jabber/ping.h
libpurple/protocols/jabber/presence.c
libpurple/protocols/jabber/presence.h
libpurple/protocols/jabber/roster.c
libpurple/protocols/jabber/roster.h
libpurple/protocols/jabber/si.c
libpurple/protocols/jabber/si.h
libpurple/protocols/jabber/usermood.h
libpurple/protocols/jabber/usernick.h
libpurple/protocols/jabber/usertune.h
libpurple/protocols/jabber/xdata.h
libpurple/protocols/msn/contact.c
libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c
libpurple/protocols/msn/msn.h
libpurple/protocols/msn/session.c
libpurple/protocols/msn/slp.c
libpurple/protocols/msn/slplink.c
libpurple/protocols/msn/soap.c
libpurple/protocols/msn/switchboard.c
libpurple/protocols/msn/userlist.c
libpurple/protocols/msnp9/httpconn.c
libpurple/protocols/msnp9/msn.c
libpurple/protocols/msnp9/slp.c
libpurple/protocols/msnp9/slpcall.c
libpurple/protocols/msnp9/slpcall.h
libpurple/protocols/msnp9/transaction.c
libpurple/protocols/myspace/myspace.c
libpurple/protocols/myspace/myspace.h
libpurple/protocols/novell/novell.c
libpurple/protocols/null/nullprpl.c
libpurple/protocols/oscar/libaim.c
libpurple/protocols/oscar/libicq.c
libpurple/protocols/oscar/oscar.c
libpurple/protocols/oscar/peer.c libpurple/protocols/qq/qq.c
libpurple/protocols/sametime/sametime.c
libpurple/protocols/silc/silc.c
libpurple/protocols/silc10/silc.c
libpurple/protocols/simple/simple.c
libpurple/protocols/yahoo/yahoo.c
libpurple/protocols/yahoo/yahoo_filexfer.c
libpurple/protocols/zephyr/ZVariables.c
libpurple/protocols/zephyr/zephyr.c libpurple/prpl.c
libpurple/prpl.h libpurple/server.c libpurple/stun.c
libpurple/theme-manager.c libpurple/util.h
libpurple/win32/win32dep.c libpurple/xmlnode.c
libpurple/xmlnode.h pidgin/Makefile.am pidgin/Makefile.mingw
pidgin/eggtrayicon.h pidgin/gtkblist-theme-loader.c
pidgin/gtkblist-theme.c pidgin/gtkblist-theme.h
pidgin/gtkblist.c pidgin/gtkcellrendererexpander.c
pidgin/gtkcellrendererexpander.h
pidgin/gtkcellrendererprogress.h pidgin/gtkconv.c
pidgin/gtkconvwin.h pidgin/gtkdebug.c pidgin/gtkdialogs.c
pidgin/gtkdnd-hints.h pidgin/gtkimhtml.c pidgin/gtkimhtml.h
pidgin/gtkimhtmltoolbar.h pidgin/gtkmain.c
pidgin/gtkmenutray.c pidgin/gtkmenutray.h pidgin/gtkplugin.c
pidgin/gtkprefs.c pidgin/gtkprefs.h pidgin/gtksound.c
pidgin/gtksourceiter.h pidgin/gtksourceundomanager.h
pidgin/gtkstatusbox.c pidgin/gtkstatusbox.h
pidgin/gtkutils.c pidgin/minidialog.c pidgin/minidialog.h
pidgin/pidginstock.c pidgin/pidginstock.h
pidgin/pixmaps/Makefile.am pidgin/plugins/cap/cap.c
pidgin/plugins/mailchk.c
pidgin/plugins/musicmessaging/musicmessaging.c
pidgin/plugins/ticker/gtkticker.h po/POTFILES.in
Modified attrs:
pidgin/pixmaps/toolbar/16/audio-call.png
pidgin/pixmaps/toolbar/16/video-call.png
ChangeLog:
merge of 'e458e71beb6cabc19c7d0fa57cd3c4cb699a9b76'
and 'f67c49459f7574a42fc6cf309560c54cb58d773c'
More information about the Commits
mailing list