soc.2009.vulture: cfcd7bf3: merge of '09bb1259e72bf8ad41d78bf596d110...

[gdick at soc.pidgin.im]

-----------------------------------------------------------------
Revision: cfcd7bf3bf2cd6a89af91f1b0e342962c9db2c74
Ancestor: 09bb1259e72bf8ad41d78bf596d11058e3444849
Ancestor: 42b2bf4ce0b52f2a1dd6de7d254ba63072bb309e
Author: gdick at soc.pidgin.im
Date: 2009-09-15T19:12:13
Branch: im.pidgin.soc.2009.vulture
URL: http://d.pidgin.im/viewmtn/revision/info/cfcd7bf3bf2cd6a89af91f1b0e342962c9db2c74

Added files:
        libpurple/tests/test_qq.c
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
        Makefile.am NEWS autogen.sh configure.ac finch/Makefile.am
        finch/libgnt/gntmain.c libpurple/Makefile.am
        libpurple/account.c libpurple/account.h libpurple/blist.c
        libpurple/blist.h libpurple/certificate.c
        libpurple/conversation.h libpurple/core.c libpurple/core.h
        libpurple/dnssrv.h libpurple/example/Makefile.am
        libpurple/media-gst.h libpurple/media.c libpurple/media.h
        libpurple/mediamanager.h
        libpurple/plugins/perl/common/XMLNode.xs
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/file_trans.c
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/qq_base.c
        libpurple/protocols/qq/qq_crypt.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/simple/Makefile.am
        libpurple/protocols/yahoo/libymsg.c libpurple/smiley.h
        libpurple/status.h libpurple/tests/Makefile.am
        libpurple/tests/check_libpurple.c
        libpurple/tests/test_jabber_jutil.c libpurple/tests/tests.h
        libpurple/theme-loader.c libpurple/theme-loader.h
        libpurple/theme.c libpurple/theme.h libpurple/util.c
        libpurple/util.h pidgin/Makefile.am pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkimhtml.h
        pidgin/gtkimhtmltoolbar.c pidgin/gtkmain.c pidgin/gtkmedia.c
        pidgin/gtkprefs.c pidgin/gtksmiley.c pidgin/gtkutils.c
        pidgin/pidginstock.c pidgin/plugins/Makefile.am
        pidgin/plugins/gestures/stroke.c
        pidgin/plugins/gevolution/eds-utils.c
        pidgin/plugins/gevolution/gevo-util.c
        pidgin/win32/nsis/pidgin-installer.nsi
        pidgin/win32/winpidgin.c pidgin.spec.in 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/check_po.pl 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/hy.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/sw.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
        vulture/acctmanager.c vulture/acctmanager.h
        vulture/purpleacct.c vulture/resource.h
        vulture/vulture-res.rc vulture/vulture.h

ChangeLog: 

merge of '09bb1259e72bf8ad41d78bf596d11058e3444849'
     and '42b2bf4ce0b52f2a1dd6de7d254ba63072bb309e'