cpw.darkrain42.xmpp.bosh, im.pidgin.pidgin: 4749e214: merge of '8ddbfe5d6f5c2455497d11ccbfff76...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Tue Apr 28 17:21:43 EDT 2009


-----------------------------------------------------------------
Revision: 4749e214af2b76bed086210a42763dc4095e7ad5
Ancestor: 8ddbfe5d6f5c2455497d11ccbfff769ed4e9fad4
Ancestor: ef988478f33650d37a90cb7c58a9ac5af81b525b
Author: darkrain42 at pidgin.im
Date: 2009-04-28T19:08:06
Branch: im.pidgin.cpw.darkrain42.xmpp.bosh
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4749e214af2b76bed086210a42763dc4095e7ad5

Deleted entries:
        libpurple/protocols/toc
Added files:
        finch/libgnt/gntprogressbar.c finch/libgnt/gntprogressbar.h
        finch/plugins/gnttinyurl.c
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/jabber/useravatar.h
        pidgin/plugins/themeedit-icon.c
        pidgin/plugins/themeedit-icon.h pidgin/plugins/themeedit.c
Modified files:
        AUTHORS COPYRIGHT ChangeLog ChangeLog.API configure.ac
        doc/TCL-HOWTO.dox doc/account-signals.dox doc/finch.1.in
        doc/pidgin.1.in finch/gntaccount.c finch/gntblist.c
        finch/gntconv.c finch/gntmedia.c finch/gntnotify.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/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/dnssrv.c libpurple/dnssrv.h
        libpurple/ft.c libpurple/internal.h libpurple/media-gst.h
        libpurple/media.c libpurple/media.h libpurple/mediamanager.c
        libpurple/mediamanager.h libpurple/mime.c libpurple/mime.h
        libpurple/network.c libpurple/plugin.c libpurple/plugin.h
        libpurple/plugins/filectl.c libpurple/plugins/joinpart.c
        libpurple/plugins/perl/perl-common.c
        libpurple/plugins/statenotify.c
        libpurple/plugins/tcl/tcl_cmds.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/parser.c
        libpurple/protocols/irc/msgs.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/bosh.c
        libpurple/protocols/jabber/bosh.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/jingle/content.c
        libpurple/protocols/jabber/jingle/content.h
        libpurple/protocols/jabber/jingle/iceudp.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        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.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.c
        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/msg.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msnp9/httpconn.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/oscar/oscar.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/qq.c
        libpurple/protocols/sametime/sametime.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/smiley.h
        libpurple/sound-theme.h libpurple/stun.c
        libpurple/theme-loader.h libpurple/theme-manager.c
        libpurple/theme-manager.h libpurple/util.h
        libpurple/win32/win32dep.c libpurple/xmlnode.c
        libpurple/xmlnode.h pidgin/eggtrayicon.h pidgin/gtkaccount.c
        pidgin/gtkblist-theme-loader.c
        pidgin/gtkblist-theme-loader.h pidgin/gtkblist-theme.c
        pidgin/gtkblist-theme.h pidgin/gtkblist.c
        pidgin/gtkcellrendererexpander.c
        pidgin/gtkcellrendererexpander.h
        pidgin/gtkcellrendererprogress.h pidgin/gtkconv.c
        pidgin/gtkconv.h pidgin/gtkdebug.c pidgin/gtkdialogs.c
        pidgin/gtkdnd-hints.h pidgin/gtkdocklet.c
        pidgin/gtkicon-theme-loader.h pidgin/gtkicon-theme.h
        pidgin/gtkimhtml.c pidgin/gtkimhtml.h
        pidgin/gtkimhtmltoolbar.c pidgin/gtkimhtmltoolbar.h
        pidgin/gtkmain.c pidgin/gtkmedia.c pidgin/gtkmedia.h
        pidgin/gtkmenutray.c pidgin/gtkmenutray.h pidgin/gtknotify.h
        pidgin/gtkplugin.c pidgin/gtkprefs.c pidgin/gtkprefs.h
        pidgin/gtksavedstatuses.c pidgin/gtksmiley.c
        pidgin/gtksound.c pidgin/gtksourceiter.h
        pidgin/gtksourceundomanager.h pidgin/gtkstatus-icon-theme.h
        pidgin/gtkstatusbox.c pidgin/gtkstatusbox.h
        pidgin/gtkutils.c pidgin/gtkutils.h pidgin/gtkwhiteboard.c
        pidgin/minidialog.c pidgin/minidialog.h pidgin/pidginstock.c
        pidgin/pidginstock.h pidgin/plugins/Makefile.am
        pidgin/plugins/cap/cap.c pidgin/plugins/contact_priority.c
        pidgin/plugins/mailchk.c pidgin/plugins/markerline.c
        pidgin/plugins/musicmessaging/musicmessaging.c
        pidgin/plugins/ticker/gtkticker.c
        pidgin/plugins/ticker/gtkticker.h
        pidgin/plugins/win32/transparency/win2ktrans.c
        pidgin/win32/nsis/pidgin-installer.nsi po/POTFILES.in
        po/de.po

ChangeLog: 

merge of '8ddbfe5d6f5c2455497d11ccbfff769ed4e9fad4'
     and 'ef988478f33650d37a90cb7c58a9ac5af81b525b'



More information about the Commits mailing list