im.pidgin.pidgin: 5bfda5530734b6609a22bc04a5cfca38d91cf790

[rlaager at pidgin.im]

revision:            5bfda5530734b6609a22bc04a5cfca38d91cf790
date:                2007-10-01T04:21:32
author:              rlaager at pidgin.im
branch:              im.pidgin.pidgin
changelog:
propagate from branch 'im.pidgin.pidgin.2.2.1' (head 4321e1e266d11dddee2cde190828ae5001812367)
            to branch 'im.pidgin.pidgin' (head 318be6f085ab78b9dd20f3b05869cca1fed28686)

manifest:
format_version "1"

new_manifest [97ce983f14b154c2bfe422dc91d896031f2c2ebd]

old_revision [318be6f085ab78b9dd20f3b05869cca1fed28686]

patch "ChangeLog"
 from [c2f161b25908eb16f5808764401c4a00b1f58ff9]
   to [018804262247b9e43505bf732746be658bb76968]

patch "NEWS"
 from [735310af79e6b6df790042cc648fb0e9bbe0e3fd]
   to [4460bed7153eb64c9f895f305c7deff33ed49728]

patch "finch/libgnt/gntstyle.c"
 from [094ba0f14be29266624dabc385f7675fe84f29d2]
   to [fa96a2f289254f2cb5ce21774ad49eadffb9a544]

patch "finch/libgnt/gntwm.c"
 from [5014a11fd97aa969c1b3cb8e851846f46e6db071]
   to [d7f3ec2aabe25e3bec09760027069101d01b8537]

patch "libpurple/protocols/jabber/google.c"
 from [03917a6d82c416dc00d87e8b9ac1caefa01f667c]
   to [1d29e418ebc78cd7a3430296f02c52dcb3781cbf]

patch "libpurple/protocols/jabber/jutil.h"
 from [6d0ede4e040b0093cbf1b95d5c1797020eccae10]
   to [febd712fa491d0cb59f5aea97d930405ea662706]

patch "pidgin/gtkconv.c"
 from [ebe83318f4b597e55d1d16dfc338dd4fab667159]
   to [07847dca42d82f448e6f12c44c4813140e0ea6f9]

patch "pidgin/gtknotify.c"
 from [02fa502bc544f582590c646b28310db19294c38c]
   to [b901bf7e4010ebfa742017742f4a9cd929618fa1]

old_revision [4321e1e266d11dddee2cde190828ae5001812367]

delete "pidgin/pixmaps/protocols/22/scalable/myspace.svg"

delete "pidgin/plugins/gevolution"

delete "pidgin/plugins/gevolution/Makefile.am"

delete "pidgin/plugins/gevolution/add_buddy_dialog.c"

delete "pidgin/plugins/gevolution/assoc-buddy.c"

delete "pidgin/plugins/gevolution/eds-utils.c"

delete "pidgin/plugins/gevolution/gevo-util.c"

delete "pidgin/plugins/gevolution/gevolution.c"

delete "pidgin/plugins/gevolution/gevolution.h"

delete "pidgin/plugins/gevolution/new_person_dialog.c"

delete "pidgin/win32/nsis/translations/arabic.nsh"

delete "po/lo.po"

rename "libpurple/protocols/msn/msn-utils.c"
    to "libpurple/protocols/msn/msnutils.c"

rename "libpurple/protocols/msn/msn-utils.h"
    to "libpurple/protocols/msn/msnutils.h"

add_dir "pidgin/plugins/gevolution"

add_file "libpurple/protocols/msn/README"
 content [8f7c40333523d3e91c3812be03863044e9edf3c3]

add_file "libpurple/protocols/msn/contact.c"
 content [237bd2df0ea6cfdc4751fed4cc3ef2bd54db66db]

add_file "libpurple/protocols/msn/contact.h"
 content [bf657b26b14a39323e1f25790621977d3ecb4679]

add_file "libpurple/protocols/msn/oim.c"
 content [193865c5c46e2ba14f09d1addfd247c04ded2386]

add_file "libpurple/protocols/msn/oim.h"
 content [f6e021b0bc119855a66361e175736ee0a4601680]

add_file "libpurple/protocols/msn/soap.c"
 content [b4246c343cc7a5051c673f14257ab0918a4db156]

add_file "libpurple/protocols/msn/soap.h"
 content [77457a117e8c85f3cfa8930c8d4581a3ba586ca7]

add_file "pidgin/pixmaps/emblems/16/birthday.png"
 content [b75211491ae20327761b5b7c31037aa93d365750]

add_file "pidgin/pixmaps/emblems/16/music.png"
 content [ec30948a10f0a5c5e68bc61e34902b7f0ea346b2]

add_file "pidgin/pixmaps/emblems/16/scalable/music.svg"
 content [d73fe91d4f0e93b966d6f7501d6987fffad63411]

add_file "pidgin/pixmaps/protocols/22/scalable/myspace.svg"
 content [adfd5fe6090c8e607b926f2a63e37c7ea701fcbf]

add_file "pidgin/plugins/gevolution/Makefile.am"
 content [3f94db301e306cb70e7e3caafb3a9ba261061ad0]

add_file "pidgin/plugins/gevolution/add_buddy_dialog.c"
 content [3fa7d0735dcec623fbffd049e2a3849d1cb87bd8]

add_file "pidgin/plugins/gevolution/assoc-buddy.c"
 content [7be281a7bc874409c9aad39256eaec4657d446d7]

add_file "pidgin/plugins/gevolution/eds-utils.c"
 content [bd53c87b8816ece3aee8c90d01d65a0238888bba]

add_file "pidgin/plugins/gevolution/gevo-util.c"
 content [bc7505b7307489559ecc6698ad6ab847d67883cd]

add_file "pidgin/plugins/gevolution/gevolution.c"
 content [893a861c9a644e483ee0adebd070d21e2af6bb70]

add_file "pidgin/plugins/gevolution/gevolution.h"
 content [509d4ee4a2935de21ec877c882e0c02150bb9619]

add_file "pidgin/plugins/gevolution/new_person_dialog.c"
 content [558974de9d187bc95fdf6e584b5e3ffede277ce1]

add_file "pidgin/win32/nsis/translations/arabic.nsh"
 content [2a2970fce95fc2f9cd1fcb1fe3f1a1b7569d9825]

add_file "po/lo.po"
 content [e862d83b10c7781f8f6aebf4a712a5a6349c1ca3]

patch "COPYRIGHT"
 from [8098981cc6ea32f03e13589c61b7587abd8ad928]
   to [e48add267248e0ee78bf01820a4611796619c22b]

patch "ChangeLog"
 from [807a1610f3c5a22c5a26dc337940a82a781901ed]
   to [018804262247b9e43505bf732746be658bb76968]

patch "configure.ac"
 from [d039e40a31103f53721c77dda586118263075197]
   to [2bb0debca20307fba5ca72adb86ae7068c266550]

patch "doc/funniest_home_convos.txt"
 from [82c5f55572eb0a42369e0f086653c987c3653b24]
   to [fa0f4dff518413db89509011365f3da930d9f7da]

patch "finch/gntblist.c"
 from [beee9d81df641a8601abe5693408aebb7f56cfe1]
   to [fcb1d60d55bd0d88e784234a8eec3db528313dc8]

patch "finch/gntconn.c"
 from [93bbd5ef3a17fc638e8b2bf3b23fddd2c543857a]
   to [bad10ad608f21e44e36b2e5a3f2b05201153ac8d]

patch "finch/gntconv.c"
 from [4e36328b74e1411573d114659d31ab30eacdd1ca]
   to [88ff55e339feb097d755753b9342ed55117ff4b8]

patch "finch/gntdebug.c"
 from [d3cf79c0ead2b77ac048423950afba75efe057be]
   to [d5dd6eaf2957a71a071c11f85df01ef814312059]

patch "finch/gntnotify.c"
 from [fce5416b2cbda8d6efb2f43dc124bfde25985c8a]
   to [3e6b8236ec80a3256522e64a8eb259a79f46daa4]

patch "finch/gntplugin.c"
 from [1ac38a2568c9fa8cc5e59c55f7a4b10f61b61d7b]
   to [3eca18ea0809488bcfd2a8068e6a333a9c9b977e]

patch "finch/gntpounce.c"
 from [6fb43d36f53858938dd460d31a9e474d94726805]
   to [aebe4b731e75af63c00f79676e167009b1f7435d]

patch "finch/gntrequest.c"
 from [b4a7372470b97ef6981c0e7af52c5df916e35556]
   to [0fd382f904ee015622875b293ae42fbecb893e07]

patch "finch/libgnt/gntentry.c"
 from [9fb2a7b21b8a6786383b01b41a5bfb854a8d551f]
   to [5551a12c1cfb74ba91c21705c24c0ebcaca53425]

patch "finch/libgnt/pygnt/gntmodule.c"
 from [4e6c2d2c05446c402e3554aa546399a010a9f3f0]
   to [c6bf0429fc388b484743e244484144ef05379cbf]

patch "finch/libgnt/pygnt/gnttree.override"
 from [185fed12c4d5cf4ce3679186193743098f718b4a]
   to [e815a6adfcb1fac099ef12929d5bf32b2f343eb4]

patch "libpurple/blist.c"
 from [862555a23e6317ed445d39deeaf0b0f4b456987c]
   to [ad31660fc4ddaa0f5edd891518e38def75c643fe]

patch "libpurple/blist.h"
 from [7fb175af72bf3fb710f328f35ca163b2edc1e4c7]
   to [fedb76effbb121058fd4292713e8feca08464821]

patch "libpurple/cmds.h"
 from [953c84ca8c44c8e5824209a605d5d889a96b1e0d]
   to [796e9865e88f475e0a36c93142e9170c3dc3cf26]

patch "libpurple/conversation.c"
 from [f45a8c89d73ba4c4ca49b94e01907d03a6a53428]
   to [2107df9530902b04e27c7a3c21af635406210c21]

patch "libpurple/internal.h"
 from [2a484141a4bf8e26e4a71e95c8e42dd538df78ae]
   to [d338ef3d4c418c585227845e498b7a8014a12a66]

patch "libpurple/notify.h"
 from [e5c87c56b3e21162fbcbbc3ba95f5ee712a06cff]
   to [96d4290ea914778f278a0a6f836658ad872d8153]

patch "libpurple/plugin.c"
 from [76813f49f76dead775126f60499d2e46791351c6]
   to [9377a1d1619f7662f2d883a0b3d98203d5947bcf]

patch "libpurple/plugins/tcl/tcl.c"
 from [9778bc6e94edfe8639e7a4f09a9f6b6dfbebd335]
   to [537bb3088163c104d65b88ca3c8f67ee6097c4b2]

patch "libpurple/plugins/tcl/tcl_cmds.c"
 from [08b60aa7bb5f1e8cd01bc6acde1e8b8ee4d9ea35]
   to [3cff3ab7de3dc8f6aa03a38d433a011d85cea347]

patch "libpurple/plugins/tcl/tcl_purple.h"
 from [c847ec4a99d5d0bb50fe511a99fe813a86ac154f]
   to [fba46b64f59ba4fe1180ac7a65b02714e2129d88]

patch "libpurple/protocols/irc/msgs.c"
 from [268c9f7531ccf78e0a77c5145df952510fe4cfc3]
   to [f622c12f00969dee5584d531367433501d203d11]

patch "libpurple/protocols/jabber/jabber.c"
 from [9566f6a2fd23699865c6a8ba16b2315d3daa3153]
   to [4e51e9d6769210016e9490d044b6730b47bad7f4]

patch "libpurple/protocols/jabber/jabber.h"
 from [3fde42e62a7ffc59f00d83a86f8049e14df097f8]
   to [09f1d54e927d0c2d48c4d16c5500db62db4747ea]

patch "libpurple/protocols/jabber/libxmpp.c"
 from [c6868a2d6cd1cd84dcb3807b86644f2b79257cf8]
   to [1596dde4ddf1f93e61ed604f0bb710463f95bb69]

patch "libpurple/protocols/msn/Makefile.am"
 from [94fd52159a3c76b4db2f047b37472fa24e77efa6]
   to [8977ed006a30cee5deefd602fcc01fb03c29f210]

patch "libpurple/protocols/msn/Makefile.mingw"
 from [5fac12f6d0be965e45235f056d01bc0eb6c32c67]
   to [ad3ff1fb8660a9e7a40baef8d2216e7f6fbed927]

patch "libpurple/protocols/msn/cmdproc.c"
 from [800a37bba57fe06cbb24458eb0f3cc4ff5291af0]
   to [7aab4f5e89e84422a0f0185b942170e64caf2d8b]

patch "libpurple/protocols/msn/command.c"
 from [101a5c45600bfd0151f5a1c2f8f683df92e58288]
   to [c254fc39b9eafaf8b9234da61716d44621c66e94]

patch "libpurple/protocols/msn/dialog.c"
 from [57b42e3a8d2639980d44ced5bf0af756eb944a14]
   to [85136580a20d10914756e9156e086d7b1087eaf4]

patch "libpurple/protocols/msn/directconn.c"
 from [5c36766ab07279be942df0ec1ac2316475a6a200]
   to [df8634bd0fd008faf6673faaf58259d90b618cf8]

patch "libpurple/protocols/msn/directconn.h"
 from [5065f1c28a423d7cef4da3ef0dd0d77d2b8ad74d]
   to [3ab33824ba31ea3872d5a8f8ae515b5c7364fece]

patch "libpurple/protocols/msn/group.c"
 from [119dd2cf3c885ab374dc9e802d6eabb0e17de384]
   to [7eb03c38b8dfce560a2bd259a56c4231068f665c]

patch "libpurple/protocols/msn/group.h"
 from [17d4364ef3e403a3441e9e4906314e8aa619afa8]
   to [e75f3e647415240751778baff8e441eb63e53440]

patch "libpurple/protocols/msn/history.c"
 from [c7d0b86a66efd9246d3042c44d0ff20bf056681a]
   to [27c19ac633ef82ab362d11e895dbb6f6cd6d71f5]

patch "libpurple/protocols/msn/msg.c"
 from [55519fa4285f95d2bc2a5a1abd46206ee5121e6a]
   to [19e687b07ad0554378eb2b7a167c722914a9abd8]

patch "libpurple/protocols/msn/msg.h"
 from [324f7868d7cf78c423a56614c64b77bb6578308a]
   to [8262bf22af11f220b073c66f1a273cd2a8ed2ed3]

patch "libpurple/protocols/msn/msn.c"
 from [5cf2c5495f1eee96279c1f3a22642c3397150e5b]
   to [df5139c37bedf0ed2d3ded6b8a357a74c61b6b63]

patch "libpurple/protocols/msn/msn.h"
 from [b22e20e606eb32b0398e620861065293c19a5b1c]
   to [dd2839c8e0ff2373f91d8757a85d934fda4d6b9f]

patch "libpurple/protocols/msn/msnutils.c"
 from [ddcf0627c9bb68b8317f5ac2ce782b560d1f25fa]
   to [e96ce0af47e118d1fdd43c0c46fc8aa2233a3888]

patch "libpurple/protocols/msn/msnutils.h"
 from [3c4555f0bcf425bea921f4b7111e3512492a697e]
   to [8f950ea5cb2bd02b6a41704fede8dd51cc1f0c1d]

patch "libpurple/protocols/msn/nexus.c"
 from [38a8064f8541b0f2d8bceefe02fcd60687d86162]
   to [d9fa147a49267475bbbcfad3e859b02cc8f1d8bf]

patch "libpurple/protocols/msn/nexus.h"
 from [31c25a806fbb3fb7a66700dc4ee388756facb352]
   to [14c07eb6c38a411fbb2e4e6ad609997c4334c126]

patch "libpurple/protocols/msn/notification.c"
 from [cbedda79fceb1d07ca3c9a8fa4f5461cae25e2c0]
   to [50f4a7162c9ab91d492a768f2621b223281a6728]

patch "libpurple/protocols/msn/notification.h"
 from [681e80141cc08b532276ee779c47cf0a1a770fc3]
   to [d2d9b811660099378399c07f59ca34f92c72bca2]

patch "libpurple/protocols/msn/servconn.c"
 from [a2a14d2bf21565b311da712ab27fce252e2a608d]
   to [9f3303c3f1925736e425af99c93cf6fd22155955]

patch "libpurple/protocols/msn/session.c"
 from [c00810400b189db9e2a3ffa25f1f430d41561bd1]
   to [f4b8c4e2e4a0aafdcd74c44eb8ed55a7437f5599]

patch "libpurple/protocols/msn/session.h"
 from [d5bec9bc0a92062231a3af894739157d9a8766c1]
   to [5e13bc52975bd12290531c1d4af7352ac4c712e2]

patch "libpurple/protocols/msn/slp.c"
 from [4c5fa0bb627bb1a0d5c81ea293cca2f605cdae90]
   to [e3a7309867f5389550094728532eaa61dd1ee6f8]

patch "libpurple/protocols/msn/slpcall.c"
 from [b030a1b9dbaca78638648cdba5ef30448101f2ab]
   to [6fe8eaabbb668caf72ebf2f75cd8701a5ed38fcf]

patch "libpurple/protocols/msn/slplink.c"
 from [8d60b4b4cc819be569c7fcabeac71e820226b75a]
   to [a9273fe65761ca39e74328d58e236f5ff103716a]

patch "libpurple/protocols/msn/state.c"
 from [5c872464e2b4a88a401384c77118fd5570f11111]
   to [18d1238a4de446000f377de14b870dbe6b849166]

patch "libpurple/protocols/msn/state.h"
 from [868b82e2dfe7df042e06bcecedf855ded40b644e]
   to [8326372c29fc682539c23a36044718b4afc62cf2]

patch "libpurple/protocols/msn/switchboard.c"
 from [db55194a4bdc9036a8d6afc56f7f1384c786fcec]
   to [d9d73a3c5f37dd4d528589c2bb0165f50a9dbde6]

patch "libpurple/protocols/msn/sync.c"
 from [a07f7804d5d27843b891a5064a57f0107a51bfe6]
   to [85a72d9061e53e69ee27083a796bdb08e5cec907]

patch "libpurple/protocols/msn/user.c"
 from [bd0a32e939658130a876b77028bf17c07beef542]
   to [2f8ca93ef769c3444be90b1436a4d4f080a3c463]

patch "libpurple/protocols/msn/user.h"
 from [87bbce26849a85fe6ebd26e5e17bae42c4584e86]
   to [177963631652919e8cc342c64d7a821b89c9adef]

patch "libpurple/protocols/msn/userlist.c"
 from [326580aca1caa4d40a247dbc31880e4091a6bc9b]
   to [9600051ba1cca50d06264efee41da6096b0272af]

patch "libpurple/protocols/msn/userlist.h"
 from [4008bd8b88aace9e87aa1d02e5fbba11e5d9ff13]
   to [86686c7beb731366308a0829fefbcc994b6a632c]

patch "libpurple/protocols/myspace/markup.c"
 from [721b8f00c6e73e17fa2d6efac29713de7c32931a]
   to [3281e6e2711eecf12224b5cad5dbc8fea7de161e]

patch "libpurple/protocols/myspace/myspace.c"
 from [0088e5f5c84d8324efb29815a06d2c9b405fddea]
   to [f3813eb28d7a14a765456c715d40a5125ec2ace6]

patch "libpurple/protocols/myspace/user.c"
 from [99fea72d02ba979ff58a3f30142d3424917df2e4]
   to [cd376f03cc62872fe687b6585cd373130330d2fb]

patch "libpurple/protocols/novell/novell.c"
 from [3961c5977fa6faf1d28df07f87a8e97ec188127b]
   to [eb9c5b0ce20d8c2d563847a6df52b8eec3f845c5]

patch "libpurple/protocols/oscar/flap_connection.c"
 from [ce63aedf0f9cb4ad475341c080c45dc5939fd1d6]
   to [86b8316839888328970775ee8a4eb3fe5c4eeb82]

patch "libpurple/protocols/oscar/odc.c"
 from [341c7512f4c1f9e9a46a794ffa654586dc5e836d]
   to [0934367189b3e8bca4a66530e9ccc1656c18dd25]

patch "libpurple/protocols/oscar/oscar.c"
 from [eb42674cb17361d02d46695db4047129e2d829c9]
   to [b2c3f0302f5a4a03fbf44288a12bd9804d33f592]

patch "libpurple/protocols/qq/login_logout.c"
 from [29b6f3c6a8fde82d33d0b2310504e05b7fcd5427]
   to [aad0141c37735d744080ceca5ee1480d18df6878]

patch "libpurple/protocols/simple/simple.c"
 from [63ca9cac31b37929cccc15543b928ed8ec5e3291]
   to [dc8ea400773a25a18ee52e5b68e5b6517b592eed]

patch "libpurple/protocols/yahoo/yahoo.c"
 from [51ac3a509e068ff6637fe5dc941c30df95a676fd]
   to [e97b192a33429dfd9f5bffd30646b3e44cfbd573]

patch "libpurple/server.c"
 from [1cb34101eda81c29645c647ebb562da567f5a50b]
   to [c3f99b11b1dddfcb13ca83be1716ae2b99221047]

patch "libpurple/sslconn.h"
 from [9345fc0da1fe13e953208fb5a4e7ca9ba6f95b52]
   to [00e64fab398510d7bfecfa27a3bc663189d5b83f]

patch "libpurple/status.c"
 from [186dd554d259db6734202e08e005279fc0327dcb]
   to [603b583997ce734929249cfd927e7d8205b4013d]

patch "libpurple/util.c"
 from [1d2f06348c95b34a2f103613e81c5c37a1476905]
   to [1587dab3bb3e194dc1639793f7e7ed80fbb7ec16]

patch "libpurple/win32/win32dep.c"
 from [1cecc3fd2b2f91285e307c2f7deb3707d39d69f7]
   to [eae9f917b07d9dc903796fcb2052b98ff5aa86a7]

patch "libpurple/win32/win32dep.h"
 from [f6cbcdc31782809f0e22b5bef830fee9d6f98b2f]
   to [637b5714741a148e9bd04fbe86b9f2cc9255550b]

patch "libpurple/xmlnode.h"
 from [e83d68f9e1a20bfd8ded256571bc87ee0fe08c47]
   to [ad49fa4e61226e97d0a9c0f25c892b9804464d99]

patch "pidgin/gtkblist.c"
 from [aade4b6d394ba1e271880e012dd494f970a3ee2d]
   to [92ec3610a3ed5d37afdc7eb78846220c8c0c3e0d]

patch "pidgin/gtkcellrendererexpander.c"
 from [b4a9842c6de349441b6b864536ca98764cbe79b1]
   to [3dac1205d95c6007b6ebea7d33e6cd66035caa50]

patch "pidgin/gtkconn.c"
 from [981393b536c669af4e380396d63ba7aeceb3f914]
   to [91fcac2a3292b83bbe5474681adf8833ce403aac]

patch "pidgin/gtkconv.c"
 from [af7c417a7268bf3663a22440be1a6ec2c22c7574]
   to [07847dca42d82f448e6f12c44c4813140e0ea6f9]

patch "pidgin/gtkdocklet.c"
 from [a665f6551295ef2b8530a6c463b5c05d2cc717b3]
   to [c0fbf99c7ebe18814fa14bd3c151a2ee8929eafd]

patch "pidgin/gtkimhtmltoolbar.c"
 from [8175c22d195121e48b144eb6c606a5412a1d45eb]
   to [04cdba5dec1fcd22b433199e5abd40e47f4fe81a]

patch "pidgin/gtkmain.c"
 from [ca3036e2264dfdf1b45487235066557a098d7aa1]
   to [97d40c4b161c5f8d586a5d75d5e397ace78ea1ba]

patch "pidgin/gtknotify.c"
 from [f9ce08d0f42cf789e1524efaa1f8615ddd27d88d]
   to [b901bf7e4010ebfa742017742f4a9cd929618fa1]

patch "pidgin/gtkprefs.c"
 from [9a4fd0c7739e642ed509f8b7d31b4bd00401bca9]
   to [d5ceef2b9099fc5e1fbc56e9b410bdc2a4e8b41c]

patch "pidgin/gtksession.c"
 from [2f6551f074665f61981d05aebfad036be567914e]
   to [2d2235d6bd20fb972d4366b7af06f04783ed5dd3]

patch "pidgin/pixmaps/dialogs/64/cool.png"
 from [ee6a1978886ebfa18e809914ff37a70a6c9b80f2]
   to [6e45ff909605c72afe69cacc602fd44787ed1102]

patch "pidgin/pixmaps/dialogs/64/error.png"
 from [42c6a39b32f2a976e5645ac47193890d047e7896]
   to [648df69044823ac3524194121b683f6e05f7e63b]

patch "pidgin/pixmaps/dialogs/64/info.png"
 from [8e6479b6e04b6e9e1fdaf34a31e5a14f7c96f030]
   to [6b5ef0007a598d7314a082aaa9d7db44cb0bed04]

patch "pidgin/pixmaps/dialogs/64/mail.png"
 from [844c46303794db94741991494a2fe608fe66ab79]
   to [22e2e3dec633aff5eba61f5785e99aac86badec3]

patch "pidgin/pixmaps/dialogs/64/question.png"
 from [411a27cd1db72eeb522ca4096e32ea93d499e236]
   to [9afcb249d8aeff73ca3df9ec24f1a8c520b9c333]

patch "pidgin/pixmaps/dialogs/64/scalable/cool.svg"
 from [be4f79506c1ec33312a617eb6dfed85b073a12a7]
   to [990f7fb16739c822fba6f5f8178a5da28961b2df]

patch "pidgin/pixmaps/dialogs/64/scalable/error.svg"
 from [ea4b8cc0d770db339108b35097a7b8a1479d8d74]
   to [13791abda6e8622ad6a918be9e7c7f266948dd09]

patch "pidgin/pixmaps/dialogs/64/scalable/info.svg"
 from [8978131e97fb8bdb39ec71802e458a79aecd1189]
   to [e557a42fbdb329bd2db72a73d005da4c4fb937f9]

patch "pidgin/pixmaps/dialogs/64/scalable/question.svg"
 from [8f75d9a4d89215951b0487f3d66d4cf4b735413b]
   to [4b52b7bb8da46c3902bac02bbf333a13289a0913]

patch "pidgin/pixmaps/dialogs/64/scalable/warning.svg"
 from [39302c304c947736518a98e64b32d27f37430693]
   to [6654c9edb035f6f3fc0d9f3e10c58f4da91b5a56]

patch "pidgin/pixmaps/dialogs/64/warning.png"
 from [5ce872e0ed79b435a3ff065a211500bfc67fd64c]
   to [da05a6ddb365c004fd04325cb8f83cccdc4ef767]

patch "pidgin/pixmaps/emblems/16/Makefile.am"
 from [5f09551ea6f80832a25f8ea8d9eee7b946206175]
   to [1955f007b55f98ba171ff082c008cdc3c89ecf33]

patch "pidgin/pixmaps/emblems/16/scalable/Makefile.am"
 from [4c3a52586606c3135f94f0fa7ef76d67cad39d78]
   to [d5670b9e4a3d7a0509f6d787ac7df8d5cedd8b49]

patch "pidgin/pixmaps/protocols/16/myspace.png"
 from [c1ed008cef54a730a2df0d353b360b24f24ef28f]
   to [662849625fbc88e7d479f6d34cbdbd9557a74d78]

patch "pidgin/pixmaps/protocols/48/myspace.png"
 from [9fa426d2750ed662bb20daffbfa503bd664ad564]
   to [deea1d39b370c3de90675c7e0ef0768147a50c34]

patch "pidgin/pixmaps/status/16/available.png"
 from [bd2c65a7b09f04a0564d6071d4b15f85660bbee6]
   to [ed68d5cd9f8f122699973511cf40f229744ced3c]

patch "pidgin/pixmaps/status/16/away.png"
 from [f20c60a133331e4275aca7045bfc64c60c65747f]
   to [7697f725ef44571c9e0f69fbfb6dc19a689254b9]

patch "pidgin/pixmaps/status/16/busy.png"
 from [7d648acc047afe08812c2a53a63f9700ce621bb3]
   to [7fa59f927d1204860b0c63fa17f842f600ed63e4]

patch "pidgin/pixmaps/status/16/extended-away.png"
 from [845e6324612dcc2c81f9bf5507060c5e2b2ee602]
   to [b82813d93a9c9a4074ad687647f3303892677b20]

patch "pidgin/pixmaps/status/16/offline.png"
 from [220d18b700a3a77f481066b74da7754a34bca371]
   to [34e1f73ff7492eb1392298a1c1d158f9d4fbf7c7]

patch "pidgin/pixmaps/status/16/rtl/extended-away.png"
 from [30bd8dd0dc465ae921f9551a46618f210138d4fd]
   to [c13ce249735737ee50f1d2525054635299b48632]

patch "pidgin/pixmaps/status/16/scalable/available.svg"
 from [38aa33209d9771e4fd448d47836ef9e28b21dcd8]
   to [a65777e3b87e98479e92797b2bc261bfa7ea7103]

patch "pidgin/pixmaps/status/16/scalable/away.svg"
 from [bbd6ebc76d5e75523e6f51b9a4b9d1b016484974]
   to [bdb8e4b119024a179594eda4d75d29e8d7b63243]

patch "pidgin/pixmaps/status/16/scalable/busy.svg"
 from [2a451be4f369be46bc1017c6f1fae1951de22321]
   to [a1550b751abac32f2a100452203ee8f4ae128aae]

patch "pidgin/pixmaps/status/16/scalable/extended-away.svg"
 from [4fbcc72b1e6caf01c9811e58275f28e3d84429a4]
   to [ff0b48b6a7bbdb709aa73fe986fdeb720fb5390a]

patch "pidgin/pixmaps/status/16/scalable/offline.svg"
 from [57f3f55d2054e5cd0535abbc86f93f34d8bc1871]
   to [45ddeac660d72abe43600a709dbf5dc577ee9da8]

patch "pidgin/pixmaps/toolbar/16/emote-select.png"
 from [8a337e1f5af5fc96343635829f1f8979558ac1e0]
   to [18ad418aedb4e7c4621a8f8b709559297867a27b]

patch "pidgin/pixmaps/toolbar/16/insert.png"
 from [8a337e1f5af5fc96343635829f1f8979558ac1e0]
   to [11e56689853828e78544ea6fc4a7a685eb1ad185]

patch "pidgin/pixmaps/toolbar/16/send-file.png"
 from [b942a89600af4a72ef9bcd699fe5ce8e0fae74e1]
   to [932b31dae2fadd2c1553b8bca8ffaeb914489f76]

patch "pidgin/plugins/history.c"
 from [b91c6020a0a398c3cf9067b76d5ee66222ae4165]
   to [9c684847cf306c078cd215d71546fefefd5642ae]

patch "pidgin/plugins/pidginrc.c"
 from [ac23c6523da0b0f6db761575bd94ae69f4f6f47a]
   to [eaebedc1ad19c4e74e7852793ba0627f338b1788]

patch "po/ChangeLog"
 from [5109b75a99989a4f60b08c88de59448a32aef371]
   to [0ec1e1924a8e00f6f561bd21c9e70388e80df978]

patch "po/POTFILES.in"
 from [cd2554afe192ecac921854eba2a76cf33d186c07]
   to [8e90d1110eb4d18b959354c56ae81f6ad4207fa0]

  set "pidgin/pixmaps/emblems/16/birthday.png"
 attr "mtn:manual_merge"
value "true"

  set "pidgin/pixmaps/emblems/16/music.png"
 attr "mtn:manual_merge"
value "true"