pidgin: cf42e14a: merge of '7c614b09b72037ebd86c03fbbeac77...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Fri May 29 20:41:14 EDT 2009


-----------------------------------------------------------------
Revision: cf42e14aa9bf1886fae4e840cc02302a0cde8caf
Ancestor: 7c614b09b72037ebd86c03fbbeac7794a155547b
Ancestor: af18689b86389686230fc6ce83cbba52690ce0cb
Author: darkrain42 at pidgin.im
Date: 2009-05-30T00:32:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cf42e14aa9bf1886fae4e840cc02302a0cde8caf

Deleted entries:
        libpurple/protocols/yahoo/yahoo_auth.c
        libpurple/protocols/yahoo/yahoo_auth.h
        libpurple/protocols/yahoo/yahoo_crypt.c
        libpurple/protocols/yahoo/yahoo_crypt.h
Added files:
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/bosh.h
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/jabber/useravatar.h po/hy.po po/sw.po
        share/ca-certs/StartCom_Certification_Authority.pem
Modified files:
        .mtn-ignore AUTHORS COPYRIGHT ChangeLog ChangeLog.API
        Makefile.mingw configure.ac doc/account-signals.dox
        doc/blist-signals.dox doc/pidgin.1.in finch/gntblist.c
        finch/gntnotify.c finch/plugins/gnttinyurl.c
        libpurple/account.c libpurple/blist.c libpurple/blist.h
        libpurple/buddyicon.c libpurple/conversation.c
        libpurple/core.c libpurple/dbus-analyze-functions.py
        libpurple/dnsquery.c libpurple/dnssrv.c libpurple/dnssrv.h
        libpurple/idle.c libpurple/media.c libpurple/media.h
        libpurple/mime.c libpurple/nat-pmp.c libpurple/network.c
        libpurple/plugins/perl/common/Certificate.xs
        libpurple/plugins/perl/common/Cipher.xs
        libpurple/plugins/perl/common/Util.xs
        libpurple/plugins/perl/perl-handlers.c
        libpurple/plugins/signals-test.c
        libpurple/plugins/statenotify.c libpurple/prefs.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/mdns_avahi.c
        libpurple/protocols/bonjour/parser.c
        libpurple/protocols/irc/cmds.c libpurple/protocols/irc/irc.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/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/disco.c
        libpurple/protocols/jabber/disco.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/iq.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/iceudp.c
        libpurple/protocols/jabber/jingle/rawudp.c
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/message.h
        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/si.c
        libpurple/protocols/jabber/si.h
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/usertune.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/user.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/msnp9/notification.c
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/family_chatnav.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/qq.c
        libpurple/protocols/qq/qq_crypt.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/yahoo/Makefile.am
        libpurple/protocols/yahoo/Makefile.mingw
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_doodle.c
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_packet.h
        libpurple/protocols/yahoo/yahoo_picture.c libpurple/prpl.c
        libpurple/prpl.h libpurple/savedstatuses.c
        libpurple/server.c libpurple/signals.c libpurple/signals.h
        libpurple/upnp.c libpurple/util.c libpurple/util.h
        libpurple/win32/global.mak libpurple/xmlnode.c
        pidgin/Makefile.am pidgin/gtkblist-theme-loader.c
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdialogs.c
        pidgin/gtkimhtml.c pidgin/gtkimhtml.h pidgin/gtknotify.c
        pidgin/gtksavedstatuses.c pidgin/gtkstatusbox.c
        pidgin/gtkutils.c pidgin/gtkutils.h
        pidgin/pixmaps/emotes/default/24/default.theme.in
        pidgin/pixmaps/emotes/small/16/small.theme.in
        pidgin/plugins/themeedit-icon.c
        pidgin/plugins/themeedit-icon.h pidgin/plugins/themeedit.c
        pidgin/plugins/ticker/ticker.c
        pidgin/win32/nsis/pidgin-installer.nsi
        pidgin/win32/pidgin_dll_rc.rc.in
        pidgin/win32/pidgin_exe_rc.rc.in pidgin/win32/winpidgin.c
        po/ChangeLog po/POTFILES.in po/af.po po/am.po po/ar.po
        po/az.po po/be at latin.po po/bg.po po/bn.po po/bs.po po/ca.po
        po/ca at valencia.po po/cs.po po/da.po po/de.po po/dz.po
        po/el.po po/en_AU.po po/en_CA.po po/en_GB.po po/eo.po
        po/es.po po/et.po po/eu.po po/fa.po po/fi.po po/fr.po
        po/ga.po po/gl.po po/gu.po po/he.po po/hi.po po/hu.po
        po/id.po po/it.po po/ja.po po/ka.po po/km.po po/kn.po
        po/ko.po po/ku.po po/lo.po po/lt.po po/mk.po po/mn.po
        po/my_MM.po po/nb.po po/ne.po po/nl.po po/nn.po po/oc.po
        po/pa.po po/pl.po po/ps.po po/pt.po po/pt_BR.po po/ro.po
        po/ru.po po/si.po po/sk.po po/sl.po po/sq.po po/sr.po
        po/sr at latin.po po/sv.po po/ta.po po/te.po po/th.po po/tr.po
        po/uk.po po/ur.po po/vi.po po/xh.po po/zh_CN.po po/zh_HK.po
        po/zh_TW.po share/ca-certs/Makefile.am

ChangeLog: 

merge of '7c614b09b72037ebd86c03fbbeac7794a155547b'
     and 'af18689b86389686230fc6ce83cbba52690ce0cb'



More information about the Commits mailing list