cpw.gillux.detachablepurple: 8fb7b5f8: propagate from branch 'im.pidgin.gobject...

gillux at soc.pidgin.im gillux at soc.pidgin.im
Sun May 15 14:06:43 EDT 2011


----------------------------------------------------------------------
Revision: 8fb7b5f804437dc8ad2369d49def3dd14466248b
Parent:   935161859d8ee6ed9cf45be80a411935bba059b7
Parent:   f0229545a42bc311f7242e3ab3648395bc8156a8
Author:   gillux at soc.pidgin.im
Date:     05/14/11 15:41:25
Branch:   im.pidgin.cpw.gillux.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/8fb7b5f804437dc8ad2369d49def3dd14466248b

Changelog: 

propagate from branch 'im.pidgin.gobjectification' (head 935161859d8ee6ed9cf45be80a411935bba059b7)
            to branch 'im.pidgin.cpw.gillux.detachablepurple' (head f0229545a42bc311f7242e3ab3648395bc8156a8)

Changes against parent 935161859d8ee6ed9cf45be80a411935bba059b7

  added    libpurple/dbus
  added    libpurple/dbus-prototypes
  added    purpled
  added    libpurple/dbus/account.c
  added    libpurple/dbus/account.h
  added    libpurple/dbus/account.xml
  added    libpurple/dbus/blist.c
  added    libpurple/dbus/blist.h
  added    libpurple/dbus/blist.xml
  added    libpurple/dbus/buddy.c
  added    libpurple/dbus/buddy.h
  added    libpurple/dbus/buddy.xml
  added    libpurple/dbus/callback.c
  added    libpurple/dbus/callback.h
  added    libpurple/dbus/callback.xml
  added    libpurple/dbus/chat.c
  added    libpurple/dbus/chat.h
  added    libpurple/dbus/chat.xml
  added    libpurple/dbus/connection.c
  added    libpurple/dbus/connection.h
  added    libpurple/dbus/connection.xml
  added    libpurple/dbus/constructor.c
  added    libpurple/dbus/constructor.h
  added    libpurple/dbus/constructor.xml
  added    libpurple/dbus/contact.c
  added    libpurple/dbus/contact.h
  added    libpurple/dbus/contact.xml
  added    libpurple/dbus/group.c
  added    libpurple/dbus/group.h
  added    libpurple/dbus/group.xml
  added    libpurple/example/remotenullclient.c
  added    libpurple/nullmarshaller.c
  added    libpurple/nullmarshaller.h
  added    purpled/Makefile.am
  added    purpled/purpled-account.c
  added    purpled/purpled-account.h
  added    purpled/purpled.c
  added    purpled/purpled.h
  added    purpled/purpled.pc.in
  patched  Makefile.am
  patched  configure.ac
  patched  finch/finch.c
  patched  finch/libgnt/wms/Makefile.am
  patched  finch/plugins/Makefile.am
  patched  libpurple/Makefile.am
  patched  libpurple/account.c
  patched  libpurple/accountlist.c
  patched  libpurple/blist.c
  patched  libpurple/buddy.c
  patched  libpurple/chat.c
  patched  libpurple/connection.c
  patched  libpurple/contact.c
  patched  libpurple/core.c
  patched  libpurple/core.h
  patched  libpurple/dbus-bindings.h
  patched  libpurple/dbus-maybe.h
  patched  libpurple/dbus-purple.h
  patched  libpurple/dbus-server.c
  patched  libpurple/dbus-server.h
  patched  libpurple/example/Makefile.am
  patched  libpurple/group.c
  patched  libpurple/marshallers.list
  patched  libpurple/plugins/perl/Makefile.am
  patched  libpurple/plugins/ssl/Makefile.am
  patched  libpurple/plugins/tcl/Makefile.am
  patched  libpurple/pobject.c
  patched  libpurple/pobject.h
  patched  libpurple/protocols/bonjour/Makefile.am
  patched  libpurple/protocols/gg/Makefile.am
  patched  libpurple/protocols/irc/Makefile.am
  patched  libpurple/protocols/jabber/Makefile.am
  patched  libpurple/protocols/msn/Makefile.am
  patched  libpurple/protocols/mxit/Makefile.am
  patched  libpurple/protocols/myspace/Makefile.am
  patched  libpurple/protocols/novell/Makefile.am
  patched  libpurple/protocols/null/Makefile.am
  patched  libpurple/protocols/oscar/Makefile.am
  patched  libpurple/protocols/sametime/Makefile.am
  patched  libpurple/protocols/silc/Makefile.am
  patched  libpurple/protocols/silc10/Makefile.am
  patched  libpurple/protocols/simple/Makefile.am
  patched  libpurple/protocols/yahoo/Makefile.am
  patched  libpurple/protocols/zephyr/Makefile.am
  patched  libpurple/util.c
  patched  pidgin/gtkmain.c
  patched  pidgin/plugins/Makefile.am
  patched  pidgin/plugins/disco/Makefile.am
  patched  pidgin/plugins/gestures/Makefile.am
  patched  pidgin/plugins/ticker/Makefile.am

Changes against parent f0229545a42bc311f7242e3ab3648395bc8156a8

  dropped  gaim-uninstalled.pc.in
  dropped  gaim.pc.in
  dropped  libpurple/gaim-compat.h
  dropped  libpurple/protocols/jabber/google.c
  dropped  libpurple/protocols/jabber/google.h
  dropped  libpurple/protocols/msn/dialog.c
  dropped  libpurple/protocols/msn/dialog.h
  dropped  libpurple/protocols/msn/sync.c
  dropped  libpurple/protocols/msn/sync.h
  dropped  libpurple/protocols/oscar/family_advert.c
  dropped  libpurple/protocols/oscar/family_invite.c
  dropped  libpurple/protocols/oscar/family_odir.c
  dropped  libpurple/protocols/oscar/family_translate.c
  dropped  libpurple/protocols/qq
  dropped  libpurple/protocols/qq/AUTHORS
  dropped  libpurple/protocols/qq/ChangeLog
  dropped  libpurple/protocols/qq/Makefile.am
  dropped  libpurple/protocols/qq/Makefile.mingw
  dropped  libpurple/protocols/qq/buddy_info.c
  dropped  libpurple/protocols/qq/buddy_info.h
  dropped  libpurple/protocols/qq/buddy_list.c
  dropped  libpurple/protocols/qq/buddy_list.h
  dropped  libpurple/protocols/qq/buddy_memo.c
  dropped  libpurple/protocols/qq/buddy_memo.h
  dropped  libpurple/protocols/qq/buddy_opt.c
  dropped  libpurple/protocols/qq/buddy_opt.h
  dropped  libpurple/protocols/qq/char_conv.c
  dropped  libpurple/protocols/qq/char_conv.h
  dropped  libpurple/protocols/qq/file_trans.c
  dropped  libpurple/protocols/qq/file_trans.h
  dropped  libpurple/protocols/qq/group.c
  dropped  libpurple/protocols/qq/group.h
  dropped  libpurple/protocols/qq/group_im.c
  dropped  libpurple/protocols/qq/group_im.h
  dropped  libpurple/protocols/qq/group_info.c
  dropped  libpurple/protocols/qq/group_info.h
  dropped  libpurple/protocols/qq/group_internal.c
  dropped  libpurple/protocols/qq/group_internal.h
  dropped  libpurple/protocols/qq/group_join.c
  dropped  libpurple/protocols/qq/group_join.h
  dropped  libpurple/protocols/qq/group_opt.c
  dropped  libpurple/protocols/qq/group_opt.h
  dropped  libpurple/protocols/qq/im.c
  dropped  libpurple/protocols/qq/im.h
  dropped  libpurple/protocols/qq/packet_parse.c
  dropped  libpurple/protocols/qq/packet_parse.h
  dropped  libpurple/protocols/qq/qq.c
  dropped  libpurple/protocols/qq/qq.h
  dropped  libpurple/protocols/qq/qq_base.c
  dropped  libpurple/protocols/qq/qq_base.h
  dropped  libpurple/protocols/qq/qq_crypt.c
  dropped  libpurple/protocols/qq/qq_crypt.h
  dropped  libpurple/protocols/qq/qq_define.c
  dropped  libpurple/protocols/qq/qq_define.h
  dropped  libpurple/protocols/qq/qq_network.c
  dropped  libpurple/protocols/qq/qq_network.h
  dropped  libpurple/protocols/qq/qq_process.c
  dropped  libpurple/protocols/qq/qq_process.h
  dropped  libpurple/protocols/qq/qq_trans.c
  dropped  libpurple/protocols/qq/qq_trans.h
  dropped  libpurple/protocols/qq/send_file.c
  dropped  libpurple/protocols/qq/send_file.h
  dropped  libpurple/protocols/qq/utils.c
  dropped  libpurple/protocols/qq/utils.h
  dropped  libpurple/purple-uninstalled.pc.in
  dropped  libpurple/purple.pc.in
  dropped  libpurple/tests/test_qq.c
  dropped  pidgin/gtkgaim-compat.h
  dropped  pidgin/pidgin-uninstalled.pc.in
  dropped  pidgin/pidgin.pc.in
  dropped  pidgin/pixmaps/emblems/16/qq-member.png
  dropped  pidgin/pixmaps/emblems/scalable/qq-member.svg
  dropped  pidgin/pixmaps/emotes/default/24/qq.png
  dropped  pidgin/pixmaps/emotes/default/24/scalable/qq.svg
  dropped  pidgin/pixmaps/emotes/small/16/cool.png
  dropped  pidgin/pixmaps/emotes/small/16/grin.png
  dropped  pidgin/pixmaps/protocols/16/qq.png
  dropped  pidgin/pixmaps/protocols/16/scalable/qq.svg
  dropped  pidgin/pixmaps/protocols/22/qq.png
  dropped  pidgin/pixmaps/protocols/22/scalable/qq.svg
  dropped  pidgin/pixmaps/protocols/48/qq.png
  dropped  pidgin/pixmaps/protocols/scalable/qq.svg
  dropped  pidgin/win32/IdleTracker
  dropped  pidgin/win32/IdleTracker/Makefile.mingw
  dropped  pidgin/win32/IdleTracker/idletrack.c
  dropped  pidgin/win32/IdleTracker/idletrack.h
  renamed  libpurple/purple-2-uninstalled.pc.in
       to  libpurple/purple-3-uninstalled.pc.in
  renamed  libpurple/purple-2.pc.in
       to  libpurple/purple-3.pc.in
  renamed  pidgin/pidgin-2-uninstalled.pc.in
       to  pidgin/pidgin-3-uninstalled.pc.in
  renamed  pidgin/pidgin-2.pc.in
       to  pidgin/pidgin-3.pc.in
  added    libpurple/protocols/jabber/google
  added    libpurple/enums.c.template
  added    libpurple/enums.h.template
  added    libpurple/protocols/gg/lib/debug.c
  added    libpurple/protocols/gg/lib/encoding.c
  added    libpurple/protocols/gg/lib/encoding.h
  added    libpurple/protocols/gg/lib/handlers.c
  added    libpurple/protocols/gg/lib/libgadu-debug.h
  added    libpurple/protocols/gg/lib/message.c
  added    libpurple/protocols/gg/lib/message.h
  added    libpurple/protocols/gg/lib/session.h
  added    libpurple/protocols/jabber/auth_digest_md5.h
  added    libpurple/protocols/jabber/google/gmail.c
  added    libpurple/protocols/jabber/google/gmail.h
  added    libpurple/protocols/jabber/google/google.c
  added    libpurple/protocols/jabber/google/google.h
  added    libpurple/protocols/jabber/google/google_presence.c
  added    libpurple/protocols/jabber/google/google_presence.h
  added    libpurple/protocols/jabber/google/google_roster.c
  added    libpurple/protocols/jabber/google/google_roster.h
  added    libpurple/protocols/jabber/google/google_session.c
  added    libpurple/protocols/jabber/google/google_session.h
  added    libpurple/protocols/jabber/google/jingleinfo.c
  added    libpurple/protocols/jabber/google/jingleinfo.h
  added    libpurple/protocols/jabber/google/relay.c
  added    libpurple/protocols/jabber/google/relay.h
  added    libpurple/protocols/msn/p2p.c
  added    libpurple/protocols/msn/p2p.h
  added    libpurple/protocols/msn/sbconn.c
  added    libpurple/protocols/msn/sbconn.h
  added    libpurple/protocols/msn/slpmsg_part.c
  added    libpurple/protocols/msn/slpmsg_part.h
  added    libpurple/protocols/msn/tlv.c
  added    libpurple/protocols/msn/tlv.h
  added    libpurple/protocols/msn/xfer.c
  added    libpurple/protocols/msn/xfer.h
  added    libpurple/protocols/mxit/voicevideo.c
  added    libpurple/protocols/mxit/voicevideo.h
  added    libpurple/protocols/oscar/authorization.c
  added    libpurple/protocols/oscar/encoding.c
  added    libpurple/protocols/oscar/encoding.h
  added    libpurple/protocols/oscar/userinfo.c
  added    libpurple/protocols/oscar/visibility.c
  added    libpurple/protocols/oscar/visibility.h
  added    libpurple/tests/test_jabber_digest_md5.c
  added    libpurple/tests/test_oscar_util.c
  added    pidgin/pixmaps/emotes/default/24/bored.png
  added    pidgin/pixmaps/emotes/default/24/cold.png
  added    pidgin/pixmaps/emotes/default/24/stressed.png
  added    pidgin/pixmaps/emotes/small/16/bored.png
  added    pidgin/pixmaps/emotes/small/16/boy.png
  added    pidgin/pixmaps/emotes/small/16/chilli.png
  added    pidgin/pixmaps/emotes/small/16/cold.png
  added    pidgin/pixmaps/emotes/small/16/drool.png
  added    pidgin/pixmaps/emotes/small/16/excruciating.png
  added    pidgin/pixmaps/emotes/small/16/eyeroll.png
  added    pidgin/pixmaps/emotes/small/16/girl.png
  added    pidgin/pixmaps/emotes/small/16/glasses-cool.png
  added    pidgin/pixmaps/emotes/small/16/lamp.png
  added    pidgin/pixmaps/emotes/small/16/lying.png
  added    pidgin/pixmaps/emotes/small/16/mrgreen.png
  added    pidgin/pixmaps/emotes/small/16/pirate.png
  added    pidgin/pixmaps/emotes/small/16/pissed-off.png
  added    pidgin/pixmaps/emotes/small/16/rose.png
  added    pidgin/pixmaps/emotes/small/16/shut-mouth.png
  added    pidgin/pixmaps/emotes/small/16/star.png
  added    pidgin/pixmaps/emotes/small/16/stressed.png
  added    pidgin/pixmaps/emotes/small/16/thunder.png
  added    pidgin/pixmaps/protocols/16/facebook.png
  added    pidgin/pixmaps/protocols/22/facebook.png
  added    pidgin/pixmaps/protocols/48/facebook.png
  added    po/mai.po
  added    po/mhr.po
  added    share/ca-certs/AddTrust_External_Root.pem
  added    share/ca-certs/Deutsche_Telekom_Root_CA_2.pem
  added    share/ca-certs/DigiCertHighAssuranceCA-3.pem
  added    share/ca-certs/Go_Daddy_Class_2_CA.pem
  added    share/ca-certs/Microsoft_Internet_Authority_2010.pem
  added    share/ca-certs/Microsoft_Secure_Server_Authority_2010.pem
  added    share/ca-certs/Thawte_Primary_Root_CA.pem
  added    share/ca-certs/ValiCert_Class_2_VA.pem
  added    share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem
  patched  .mtn-ignore
  patched  AUTHORS
  patched  COPYRIGHT
  patched  ChangeLog
  patched  ChangeLog.API
  patched  Doxyfile.in
  patched  Makefile.am
  patched  NEWS
  patched  configure.ac
  patched  doc/account-signals.dox
  patched  doc/conversation-signals.dox
  patched  doc/pidgin.1.in
  patched  finch/finch.c
  patched  finch/getopt.c
  patched  finch/getopt1.c
  patched  finch/gntaccount.c
  patched  finch/gntblist.c
  patched  finch/gntcertmgr.c
  patched  finch/gntconn.c
  patched  finch/gntconv.c
  patched  finch/gntft.c
  patched  finch/gntft.h
  patched  finch/gntlog.h
  patched  finch/gntmedia.c
  patched  finch/gntnotify.c
  patched  finch/gntplugin.c
  patched  finch/gntprefs.c
  patched  finch/gntrequest.c
  patched  finch/gntsound.c
  patched  finch/gntsound.h
  patched  finch/gntstatus.c
  patched  finch/gntui.c
  patched  finch/libgnt/gnt-skel.h
  patched  finch/libgnt/gntbindable.c
  patched  finch/libgnt/gntbindable.h
  patched  finch/libgnt/gntbox.c
  patched  finch/libgnt/gntcheckbox.c
  patched  finch/libgnt/gntclipboard.c
  patched  finch/libgnt/gntcolors.c
  patched  finch/libgnt/gntcombobox.h
  patched  finch/libgnt/gntentry.c
  patched  finch/libgnt/gntfilesel.c
  patched  finch/libgnt/gntkeys.h
  patched  finch/libgnt/gntmain.c
  patched  finch/libgnt/gntmenu.h
  patched  finch/libgnt/gntprogressbar.c
  patched  finch/libgnt/gntslider.h
  patched  finch/libgnt/gntstyle.c
  patched  finch/libgnt/gnttextview.c
  patched  finch/libgnt/gnttree.c
  patched  finch/libgnt/gnttree.h
  patched  finch/libgnt/gntutils.h
  patched  finch/libgnt/gntwidget.c
  patched  finch/libgnt/gntwm.c
  patched  finch/libgnt/gntws.h
  patched  finch/libgnt/test/combo.c
  patched  finch/libgnt/test/focus.c
  patched  finch/libgnt/test/tv.c
  patched  finch/libgnt/test/wm.c
  patched  finch/libgnt/wms/s.c
  patched  finch/plugins/gntgf.c
  patched  libpurple/Makefile.am
  patched  libpurple/account.c
  patched  libpurple/account.h
  patched  libpurple/accountlist.c
  patched  libpurple/blist.c
  patched  libpurple/buddy.c
  patched  libpurple/buddyicon.c
  patched  libpurple/certificate.c
  patched  libpurple/cipher/cipher.h
  patched  libpurple/circbuffer.c
  patched  libpurple/circbuffer.h
  patched  libpurple/connection.c
  patched  libpurple/connection.h
  patched  libpurple/conversation.c
  patched  libpurple/conversation.h
  patched  libpurple/core.c
  patched  libpurple/core.h
  patched  libpurple/dbus-analyze-functions.py
  patched  libpurple/dbus-analyze-signals.py
  patched  libpurple/dbus-server.c
  patched  libpurple/debug.h
  patched  libpurple/desktopitem.c
  patched  libpurple/dnsquery.c
  patched  libpurple/dnsquery.h
  patched  libpurple/dnssrv.c
  patched  libpurple/dnssrv.h
  patched  libpurple/example/nullclient.c
  patched  libpurple/ft.c
  patched  libpurple/ft.h
  patched  libpurple/group.h
  patched  libpurple/internal.h
  patched  libpurple/log.c
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/media/backend-iface.c
  patched  libpurple/media/backend-iface.h
  patched  libpurple/media/candidate.c
  patched  libpurple/media/codec.c
  patched  libpurple/media/codec.h
  patched  libpurple/media-gst.h
  patched  libpurple/media.c
  patched  libpurple/media.h
  patched  libpurple/mediamanager.c
  patched  libpurple/mime.c
  patched  libpurple/network.c
  patched  libpurple/network.h
  patched  libpurple/notify.c
  patched  libpurple/notify.h
  patched  libpurple/ntlm.c
  patched  libpurple/plugins/autoaccept.c
  patched  libpurple/plugins/codeinline.c
  patched  libpurple/plugins/fortuneprofile.pl
  patched  libpurple/plugins/idle.c
  patched  libpurple/plugins/log_reader.c
  patched  libpurple/plugins/mono/loader/blist-glue.c
  patched  libpurple/plugins/mono/loader/debug-glue.c
  patched  libpurple/plugins/mono/loader/mono-helper.c
  patched  libpurple/plugins/mono/loader/mono-helper.h
  patched  libpurple/plugins/mono/loader/signal-glue.c
  patched  libpurple/plugins/mono/loader/status-glue.c
  patched  libpurple/plugins/offlinemsg.c
  patched  libpurple/plugins/perl/common/BuddyList.xs
  patched  libpurple/plugins/perl/common/Conversation.xs
  patched  libpurple/plugins/perl/common/Makefile.PL.in
  patched  libpurple/plugins/perl/common/Server.xs
  patched  libpurple/plugins/perl/common/Util.xs
  patched  libpurple/plugins/psychic.c
  patched  libpurple/plugins/signals-test.c
  patched  libpurple/plugins/ssl/ssl-gnutls.c
  patched  libpurple/plugins/ssl/ssl-nss.c
  patched  libpurple/plugins/tcl/tcl_cmd.c
  patched  libpurple/plugins/tcl/tcl_cmds.c
  patched  libpurple/plugins/tcl/tcl_glib.c
  patched  libpurple/plugins/tcl/tcl_glib.h
  patched  libpurple/plugins/tcl/tcl_purple.h
  patched  libpurple/plugins/tcl/tcl_ref.c
  patched  libpurple/plugins/tcl/tcl_signals.c
  patched  libpurple/pounce.c
  patched  libpurple/pounce.h
  patched  libpurple/prefs.c
  patched  libpurple/protocols/Makefile.am
  patched  libpurple/protocols/Makefile.mingw
  patched  libpurple/protocols/bonjour/bonjour.c
  patched  libpurple/protocols/bonjour/bonjour.h
  patched  libpurple/protocols/bonjour/bonjour_ft.c
  patched  libpurple/protocols/bonjour/dns_sd_proxy.c
  patched  libpurple/protocols/bonjour/dns_sd_proxy.h
  patched  libpurple/protocols/bonjour/jabber.c
  patched  libpurple/protocols/bonjour/jabber.h
  patched  libpurple/protocols/bonjour/mdns_avahi.c
  patched  libpurple/protocols/bonjour/mdns_common.c
  patched  libpurple/protocols/bonjour/mdns_common.h
  patched  libpurple/protocols/bonjour/mdns_win32.c
  patched  libpurple/protocols/gg/Makefile.am
  patched  libpurple/protocols/gg/Makefile.mingw
  patched  libpurple/protocols/gg/buddylist.c
  patched  libpurple/protocols/gg/buddylist.h
  patched  libpurple/protocols/gg/confer.h
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/gg/gg.h
  patched  libpurple/protocols/gg/lib/COPYING
  patched  libpurple/protocols/gg/lib/common.c
  patched  libpurple/protocols/gg/lib/dcc.c
  patched  libpurple/protocols/gg/lib/dcc7.c
  patched  libpurple/protocols/gg/lib/events.c
  patched  libpurple/protocols/gg/lib/http.c
  patched  libpurple/protocols/gg/lib/libgadu-internal.h
  patched  libpurple/protocols/gg/lib/libgadu.c
  patched  libpurple/protocols/gg/lib/libgadu.h
  patched  libpurple/protocols/gg/lib/obsolete.c
  patched  libpurple/protocols/gg/lib/protocol.h
  patched  libpurple/protocols/gg/lib/pubdir.c
  patched  libpurple/protocols/gg/lib/pubdir50.c
  patched  libpurple/protocols/gg/lib/resolver.c
  patched  libpurple/protocols/gg/lib/resolver.h
  patched  libpurple/protocols/gg/lib/sha1.c
  patched  libpurple/protocols/gg/search.h
  patched  libpurple/protocols/irc/cmds.c
  patched  libpurple/protocols/irc/dcc_send.c
  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/irc/irc.h
  patched  libpurple/protocols/irc/msgs.c
  patched  libpurple/protocols/irc/parse.c
  patched  libpurple/protocols/jabber/Makefile.am
  patched  libpurple/protocols/jabber/Makefile.mingw
  patched  libpurple/protocols/jabber/adhoccommands.c
  patched  libpurple/protocols/jabber/auth.c
  patched  libpurple/protocols/jabber/auth.h
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/auth_digest_md5.c
  patched  libpurple/protocols/jabber/auth_plain.c
  patched  libpurple/protocols/jabber/auth_scram.c
  patched  libpurple/protocols/jabber/bosh.c
  patched  libpurple/protocols/jabber/buddy.c
  patched  libpurple/protocols/jabber/caps.c
  patched  libpurple/protocols/jabber/chat.c
  patched  libpurple/protocols/jabber/chat.h
  patched  libpurple/protocols/jabber/data.c
  patched  libpurple/protocols/jabber/data.h
  patched  libpurple/protocols/jabber/disco.c
  patched  libpurple/protocols/jabber/ibb.h
  patched  libpurple/protocols/jabber/iq.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/jabber.h
  patched  libpurple/protocols/jabber/jingle/content.c
  patched  libpurple/protocols/jabber/jingle/iceudp.c
  patched  libpurple/protocols/jabber/jingle/jingle.c
  patched  libpurple/protocols/jabber/jingle/jingle.h
  patched  libpurple/protocols/jabber/jingle/rawudp.c
  patched  libpurple/protocols/jabber/jingle/rtp.c
  patched  libpurple/protocols/jabber/jingle/session.c
  patched  libpurple/protocols/jabber/jingle/transport.c
  patched  libpurple/protocols/jabber/jutil.c
  patched  libpurple/protocols/jabber/libxmpp.c
  patched  libpurple/protocols/jabber/message.c
  patched  libpurple/protocols/jabber/oob.c
  patched  libpurple/protocols/jabber/parser.c
  patched  libpurple/protocols/jabber/presence.c
  patched  libpurple/protocols/jabber/roster.c
  patched  libpurple/protocols/jabber/si.c
  patched  libpurple/protocols/jabber/usernick.c
  patched  libpurple/protocols/jabber/win32/posix.uname.c
  patched  libpurple/protocols/msn/Makefile.am
  patched  libpurple/protocols/msn/Makefile.mingw
  patched  libpurple/protocols/msn/cmdproc.c
  patched  libpurple/protocols/msn/cmdproc.h
  patched  libpurple/protocols/msn/command.c
  patched  libpurple/protocols/msn/command.h
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/contact.h
  patched  libpurple/protocols/msn/directconn.c
  patched  libpurple/protocols/msn/directconn.h
  patched  libpurple/protocols/msn/error.c
  patched  libpurple/protocols/msn/error.h
  patched  libpurple/protocols/msn/group.h
  patched  libpurple/protocols/msn/history.h
  patched  libpurple/protocols/msn/httpconn.c
  patched  libpurple/protocols/msn/httpconn.h
  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/msg.h
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/msn.h
  patched  libpurple/protocols/msn/msnutils.c
  patched  libpurple/protocols/msn/msnutils.h
  patched  libpurple/protocols/msn/nexus.c
  patched  libpurple/protocols/msn/nexus.h
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/notification.h
  patched  libpurple/protocols/msn/object.c
  patched  libpurple/protocols/msn/object.h
  patched  libpurple/protocols/msn/oim.c
  patched  libpurple/protocols/msn/servconn.c
  patched  libpurple/protocols/msn/servconn.h
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/session.h
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/msn/slp.h
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/msn/slpcall.h
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/msn/slplink.h
  patched  libpurple/protocols/msn/slpmsg.c
  patched  libpurple/protocols/msn/slpmsg.h
  patched  libpurple/protocols/msn/soap.c
  patched  libpurple/protocols/msn/state.c
  patched  libpurple/protocols/msn/state.h
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/switchboard.h
  patched  libpurple/protocols/msn/table.h
  patched  libpurple/protocols/msn/transaction.c
  patched  libpurple/protocols/msn/transaction.h
  patched  libpurple/protocols/msn/user.c
  patched  libpurple/protocols/msn/user.h
  patched  libpurple/protocols/msn/userlist.c
  patched  libpurple/protocols/msn/userlist.h
  patched  libpurple/protocols/mxit/Makefile.am
  patched  libpurple/protocols/mxit/Makefile.mingw
  patched  libpurple/protocols/mxit/actions.c
  patched  libpurple/protocols/mxit/chunk.c
  patched  libpurple/protocols/mxit/chunk.h
  patched  libpurple/protocols/mxit/formcmds.c
  patched  libpurple/protocols/mxit/login.c
  patched  libpurple/protocols/mxit/markup.c
  patched  libpurple/protocols/mxit/multimx.c
  patched  libpurple/protocols/mxit/mxit.c
  patched  libpurple/protocols/mxit/mxit.h
  patched  libpurple/protocols/mxit/profile.c
  patched  libpurple/protocols/mxit/profile.h
  patched  libpurple/protocols/mxit/protocol.c
  patched  libpurple/protocols/mxit/protocol.h
  patched  libpurple/protocols/mxit/roster.c
  patched  libpurple/protocols/mxit/roster.h
  patched  libpurple/protocols/myspace/markup.c
  patched  libpurple/protocols/myspace/message.c
  patched  libpurple/protocols/myspace/myspace.c
  patched  libpurple/protocols/myspace/user.c
  patched  libpurple/protocols/novell/novell.c
  patched  libpurple/protocols/null/nullprpl.c
  patched  libpurple/protocols/oscar/Makefile.am
  patched  libpurple/protocols/oscar/Makefile.mingw
  patched  libpurple/protocols/oscar/bstream.c
  patched  libpurple/protocols/oscar/clientlogin.c
  patched  libpurple/protocols/oscar/family_admin.c
  patched  libpurple/protocols/oscar/family_alert.c
  patched  libpurple/protocols/oscar/family_auth.c
  patched  libpurple/protocols/oscar/family_bart.c
  patched  libpurple/protocols/oscar/family_bos.c
  patched  libpurple/protocols/oscar/family_buddy.c
  patched  libpurple/protocols/oscar/family_chat.c
  patched  libpurple/protocols/oscar/family_chatnav.c
  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/oscar/family_icbm.c
  patched  libpurple/protocols/oscar/family_icq.c
  patched  libpurple/protocols/oscar/family_locate.c
  patched  libpurple/protocols/oscar/family_oservice.c
  patched  libpurple/protocols/oscar/family_userlookup.c
  patched  libpurple/protocols/oscar/flap_connection.c
  patched  libpurple/protocols/oscar/libaim.c
  patched  libpurple/protocols/oscar/libicq.c
  patched  libpurple/protocols/oscar/misc.c
  patched  libpurple/protocols/oscar/msgcookie.c
  patched  libpurple/protocols/oscar/odc.c
  patched  libpurple/protocols/oscar/oft.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/oscar.h
  patched  libpurple/protocols/oscar/oscar_data.c
  patched  libpurple/protocols/oscar/oscarcommon.h
  patched  libpurple/protocols/oscar/peer.c
  patched  libpurple/protocols/oscar/peer.h
  patched  libpurple/protocols/oscar/peer_proxy.c
  patched  libpurple/protocols/oscar/rxhandlers.c
  patched  libpurple/protocols/oscar/snac.c
  patched  libpurple/protocols/oscar/tlv.c
  patched  libpurple/protocols/oscar/util.c
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/silc/chat.c
  patched  libpurple/protocols/silc/ops.c
  patched  libpurple/protocols/silc/silc.c
  patched  libpurple/protocols/silc/silcpurple.h
  patched  libpurple/protocols/silc10/buddy.c
  patched  libpurple/protocols/silc10/chat.c
  patched  libpurple/protocols/silc10/ops.c
  patched  libpurple/protocols/silc10/silc.c
  patched  libpurple/protocols/silc10/silcpurple.h
  patched  libpurple/protocols/silc10/util.c
  patched  libpurple/protocols/silc10/wb.c
  patched  libpurple/protocols/simple/simple.c
  patched  libpurple/protocols/simple/simple.h
  patched  libpurple/protocols/simple/sipmsg.h
  patched  libpurple/protocols/yahoo/libyahoo.c
  patched  libpurple/protocols/yahoo/libyahoojp.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/libymsg.h
  patched  libpurple/protocols/yahoo/util.c
  patched  libpurple/protocols/yahoo/yahoo_aliases.c
  patched  libpurple/protocols/yahoo/yahoo_doodle.c
  patched  libpurple/protocols/yahoo/yahoo_doodle.h
  patched  libpurple/protocols/yahoo/yahoo_filexfer.c
  patched  libpurple/protocols/yahoo/yahoo_friend.c
  patched  libpurple/protocols/yahoo/yahoo_friend.h
  patched  libpurple/protocols/yahoo/yahoo_packet.c
  patched  libpurple/protocols/yahoo/yahoo_profile.c
  patched  libpurple/protocols/yahoo/yahoochat.c
  patched  libpurple/protocols/yahoo/ycht.c
  patched  libpurple/protocols/yahoo/ycht.h
  patched  libpurple/protocols/zephyr/ZAsyncLocate.c
  patched  libpurple/protocols/zephyr/ZCkAuth.c
  patched  libpurple/protocols/zephyr/ZCkIfNot.c
  patched  libpurple/protocols/zephyr/ZClosePort.c
  patched  libpurple/protocols/zephyr/ZCmpUID.c
  patched  libpurple/protocols/zephyr/ZCmpUIDP.c
  patched  libpurple/protocols/zephyr/ZFlsLocs.c
  patched  libpurple/protocols/zephyr/ZFlsSubs.c
  patched  libpurple/protocols/zephyr/ZFmtAuth.c
  patched  libpurple/protocols/zephyr/ZFmtList.c
  patched  libpurple/protocols/zephyr/ZFmtNotice.c
  patched  libpurple/protocols/zephyr/ZFmtRaw.c
  patched  libpurple/protocols/zephyr/ZFmtRawLst.c
  patched  libpurple/protocols/zephyr/ZFmtSmRLst.c
  patched  libpurple/protocols/zephyr/ZFmtSmRaw.c
  patched  libpurple/protocols/zephyr/ZFreeNot.c
  patched  libpurple/protocols/zephyr/ZGetLocs.c
  patched  libpurple/protocols/zephyr/ZGetSender.c
  patched  libpurple/protocols/zephyr/ZGetSubs.c
  patched  libpurple/protocols/zephyr/ZGetWGPort.c
  patched  libpurple/protocols/zephyr/ZIfNotice.c
  patched  libpurple/protocols/zephyr/ZInit.c
  patched  libpurple/protocols/zephyr/ZLocations.c
  patched  libpurple/protocols/zephyr/ZMakeAscii.c
  patched  libpurple/protocols/zephyr/ZMkAuth.c
  patched  libpurple/protocols/zephyr/ZNewLocU.c
  patched  libpurple/protocols/zephyr/ZOpenPort.c
  patched  libpurple/protocols/zephyr/ZParseNot.c
  patched  libpurple/protocols/zephyr/ZPeekIfNot.c
  patched  libpurple/protocols/zephyr/ZPeekNot.c
  patched  libpurple/protocols/zephyr/ZPeekPkt.c
  patched  libpurple/protocols/zephyr/ZPending.c
  patched  libpurple/protocols/zephyr/ZReadAscii.c
  patched  libpurple/protocols/zephyr/ZRecvNot.c
  patched  libpurple/protocols/zephyr/ZRecvPkt.c
  patched  libpurple/protocols/zephyr/ZRetSubs.c
  patched  libpurple/protocols/zephyr/ZSendList.c
  patched  libpurple/protocols/zephyr/ZSendNot.c
  patched  libpurple/protocols/zephyr/ZSendPkt.c
  patched  libpurple/protocols/zephyr/ZSendRLst.c
  patched  libpurple/protocols/zephyr/ZSendRaw.c
  patched  libpurple/protocols/zephyr/ZSetDest.c
  patched  libpurple/protocols/zephyr/ZSetFD.c
  patched  libpurple/protocols/zephyr/ZSetSrv.c
  patched  libpurple/protocols/zephyr/ZSubs.c
  patched  libpurple/protocols/zephyr/ZVariables.c
  patched  libpurple/protocols/zephyr/ZWait4Not.c
  patched  libpurple/protocols/zephyr/ZhmStat.c
  patched  libpurple/protocols/zephyr/Zinternal.c
  patched  libpurple/protocols/zephyr/sysdep.h
  patched  libpurple/protocols/zephyr/zephyr.c
  patched  libpurple/proxy.c
  patched  libpurple/proxy.h
  patched  libpurple/prpl.c
  patched  libpurple/prpl.h
  patched  libpurple/purple-remote
  patched  libpurple/purple-url-handler
  patched  libpurple/request.c
  patched  libpurple/request.h
  patched  libpurple/savedstatuses.c
  patched  libpurple/server.h
  patched  libpurple/signals.c
  patched  libpurple/signals.h
  patched  libpurple/sound-theme-loader.h
  patched  libpurple/sound-theme.h
  patched  libpurple/stun.c
  patched  libpurple/tests/Makefile.am
  patched  libpurple/tests/check_libpurple.c
  patched  libpurple/tests/test_util.c
  patched  libpurple/tests/tests.h
  patched  libpurple/theme-loader.h
  patched  libpurple/theme-manager.c
  patched  libpurple/theme-manager.h
  patched  libpurple/theme.h
  patched  libpurple/upnp.c
  patched  libpurple/util.c
  patched  libpurple/util.h
  patched  libpurple/win32/giowin32.c
  patched  libpurple/win32/global.mak
  patched  libpurple/win32/libc_interface.c
  patched  libpurple/win32/targets.mak
  patched  libpurple/win32/win32dep.c
  patched  libpurple/xmlnode.c
  patched  pidgin/Makefile.am
  patched  pidgin/Makefile.mingw
  patched  pidgin/gtkaccount.c
  patched  pidgin/gtkblist-theme-loader.c
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkblist.h
  patched  pidgin/gtkcertmgr.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkconv.h
  patched  pidgin/gtkdebug.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkdocklet-gtk.c
  patched  pidgin/gtkft.c
  patched  pidgin/gtkft.h
  patched  pidgin/gtkidle.c
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkimhtml.h
  patched  pidgin/gtkimhtmltoolbar.c
  patched  pidgin/gtklog.c
  patched  pidgin/gtkmain.c
  patched  pidgin/gtkmedia.c
  patched  pidgin/gtknotify.c
  patched  pidgin/gtkplugin.c
  patched  pidgin/gtkpounce.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/gtkprivacy.c
  patched  pidgin/gtkrequest.c
  patched  pidgin/gtkroomlist.c
  patched  pidgin/gtksavedstatuses.c
  patched  pidgin/gtkscrollbook.c
  patched  pidgin/gtksession.c
  patched  pidgin/gtksmiley.c
  patched  pidgin/gtksound.c
  patched  pidgin/gtksourceiter.c
  patched  pidgin/gtksourceundomanager.c
  patched  pidgin/gtkstatusbox.c
  patched  pidgin/gtkthemes.c
  patched  pidgin/gtkutils.c
  patched  pidgin/gtkutils.h
  patched  pidgin/gtkwhiteboard.c
  patched  pidgin/minidialog.c
  patched  pidgin/minidialog.h
  patched  pidgin/pidgin-3-uninstalled.pc.in
  patched  pidgin/pidgin-3.pc.in
  patched  pidgin/pidginstock.h
  patched  pidgin/pidgintooltip.c
  patched  pidgin/pixmaps/Makefile.am
  patched  pidgin/pixmaps/emotes/default/24/Makefile.am
  patched  pidgin/pixmaps/emotes/default/24/default.theme.in
  patched  pidgin/pixmaps/emotes/small/16/Makefile.am
  patched  pidgin/pixmaps/emotes/small/16/amorous.png
  patched  pidgin/pixmaps/emotes/small/16/embarrassed.png
  patched  pidgin/pixmaps/emotes/small/16/excited.png
  patched  pidgin/pixmaps/emotes/small/16/hungry.png
  patched  pidgin/pixmaps/emotes/small/16/sleeping.png
  patched  pidgin/pixmaps/emotes/small/16/small.theme.in
  patched  pidgin/pixmaps/pidgin.ico
  patched  pidgin/plugins/Makefile.mingw
  patched  pidgin/plugins/cap/cap.c
  patched  pidgin/plugins/cap/cap.h
  patched  pidgin/plugins/convcolors.c
  patched  pidgin/plugins/crazychat/QTUtilities.c
  patched  pidgin/plugins/crazychat/QTUtilities.h
  patched  pidgin/plugins/crazychat/Utilities.c
  patched  pidgin/plugins/crazychat/Utilities.h
  patched  pidgin/plugins/crazychat/camdata.c
  patched  pidgin/plugins/crazychat/camdata.h
  patched  pidgin/plugins/crazychat/camproc.c
  patched  pidgin/plugins/crazychat/cc_features.c
  patched  pidgin/plugins/crazychat/cc_gtk_gl.c
  patched  pidgin/plugins/crazychat/cc_network.c
  patched  pidgin/plugins/crazychat/cc_output.c
  patched  pidgin/plugins/crazychat/cc_pidgin_plugin.c
  patched  pidgin/plugins/crazychat/crazychat.c
  patched  pidgin/plugins/crazychat/dog_lids.c
  patched  pidgin/plugins/crazychat/doggy.c
  patched  pidgin/plugins/crazychat/draw.c
  patched  pidgin/plugins/crazychat/eye.c
  patched  pidgin/plugins/crazychat/eyes.c
  patched  pidgin/plugins/crazychat/face.c
  patched  pidgin/plugins/crazychat/face.h
  patched  pidgin/plugins/crazychat/filter.c
  patched  pidgin/plugins/crazychat/filter.h
  patched  pidgin/plugins/crazychat/glm.c
  patched  pidgin/plugins/crazychat/glm.h
  patched  pidgin/plugins/crazychat/main.c
  patched  pidgin/plugins/crazychat/models.c
  patched  pidgin/plugins/crazychat/sharky.c
  patched  pidgin/plugins/disco/gtkdisco.c
  patched  pidgin/plugins/gestures/stroke-draw.c
  patched  pidgin/plugins/gevolution/add_buddy_dialog.c
  patched  pidgin/plugins/gevolution/assoc-buddy.c
  patched  pidgin/plugins/gevolution/eds-utils.c
  patched  pidgin/plugins/gevolution/gevo-util.c
  patched  pidgin/plugins/gevolution/gevolution.c
  patched  pidgin/plugins/gevolution/new_person_dialog.c
  patched  pidgin/plugins/markerline.c
  patched  pidgin/plugins/musicmessaging/musicmessaging.c
  patched  pidgin/plugins/notify.c
  patched  pidgin/plugins/perl/common/Makefile.PL.in
  patched  pidgin/plugins/relnot.c
  patched  pidgin/plugins/sendbutton.c
  patched  pidgin/plugins/spellchk.c
  patched  pidgin/plugins/themeedit-icon.c
  patched  pidgin/plugins/themeedit.c
  patched  pidgin/plugins/ticker/gtkticker.h
  patched  pidgin/plugins/ticker/ticker.c
  patched  pidgin/plugins/vvconfig.c
  patched  pidgin/plugins/win32/winprefs/gtkappbar.c
  patched  pidgin/plugins/win32/winprefs/gtkappbar.h
  patched  pidgin/plugins/win32/winprefs/winprefs.c
  patched  pidgin/plugins/xmppconsole.c
  patched  pidgin/win32/gtkdocklet-win32.c
  patched  pidgin/win32/gtkwin32dep.c
  patched  pidgin/win32/gtkwin32dep.h
  patched  pidgin/win32/nsis/nsis_translations.desktop.in
  patched  pidgin/win32/nsis/pidgin-installer.nsi
  patched  pidgin/win32/untar.c
  patched  pidgin/win32/winpidgin.c
  patched  pidgin/win32/wspell.c
  patched  pidgin.spec.in
  patched  po/ChangeLog
  patched  po/POTFILES.in
  patched  po/af.po
  patched  po/am.po
  patched  po/ar.po
  patched  po/as.po
  patched  po/az.po
  patched  po/be at latin.po
  patched  po/bg.po
  patched  po/bn.po
  patched  po/bn_IN.po
  patched  po/bs.po
  patched  po/ca.po
  patched  po/ca at valencia.po
  patched  po/cs.po
  patched  po/da.po
  patched  po/de.po
  patched  po/dz.po
  patched  po/el.po
  patched  po/en_AU.po
  patched  po/en_CA.po
  patched  po/en_GB.po
  patched  po/eo.po
  patched  po/es.po
  patched  po/et.po
  patched  po/eu.po
  patched  po/fa.po
  patched  po/fi.po
  patched  po/fr.po
  patched  po/ga.po
  patched  po/gl.po
  patched  po/gu.po
  patched  po/he.po
  patched  po/hi.po
  patched  po/hu.po
  patched  po/hy.po
  patched  po/id.po
  patched  po/it.po
  patched  po/ja.po
  patched  po/ka.po
  patched  po/km.po
  patched  po/kn.po
  patched  po/ko.po
  patched  po/ku.po
  patched  po/l10n.xsl
  patched  po/lo.po
  patched  po/lt.po
  patched  po/mk.po
  patched  po/ml.po
  patched  po/mn.po
  patched  po/mr.po
  patched  po/ms_MY.po
  patched  po/my_MM.po
  patched  po/nb.po
  patched  po/ne.po
  patched  po/nl.po
  patched  po/nn.po
  patched  po/oc.po
  patched  po/or.po
  patched  po/pa.po
  patched  po/pl.po
  patched  po/ps.po
  patched  po/pt.po
  patched  po/pt_BR.po
  patched  po/ro.po
  patched  po/ru.po
  patched  po/si.po
  patched  po/sk.po
  patched  po/sl.po
  patched  po/sq.po
  patched  po/sr.po
  patched  po/sr at latin.po
  patched  po/stats.pl
  patched  po/sv.po
  patched  po/sw.po
  patched  po/ta.po
  patched  po/te.po
  patched  po/th.po
  patched  po/tr.po
  patched  po/uk.po
  patched  po/ur.po
  patched  po/vi.po
  patched  po/xh.po
  patched  po/zh_CN.po
  patched  po/zh_HK.po
  patched  po/zh_TW.po
  patched  share/ca-certs/Makefile.am
  attr on  pidgin/pixmaps/emotes/default/24/bored.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/default/24/cold.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/default/24/stressed.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/bored.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/boy.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/chilli.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/cold.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/drool.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/excruciating.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/eyeroll.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/girl.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/glasses-cool.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/lamp.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/lying.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/mrgreen.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/pirate.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/pissed-off.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/rose.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/shut-mouth.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/star.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/stressed.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/thunder.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/protocols/16/facebook.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/protocols/22/facebook.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/protocols/48/facebook.png
      set  mtn:manual_merge
       to  true



More information about the Commits mailing list