im.pidgin.pidgin: 6c08c628ee64e16c824829c25befc0ca09338f9d

[resiak at soc.pidgin.im]

revision:            6c08c628ee64e16c824829c25befc0ca09338f9d
date:                2007-10-06T17:49:40
author:              resiak at soc.pidgin.im
branch:              im.pidgin.pidgin
changelog:
merge of '1757e82b3ed17d8ad45db9d2c62f0187a8bee93d'
     and '3d1e069061da093a2d8773199e5938f384f2e9f1'

manifest:
format_version "1"

new_manifest [947ea423186e8caa5bf65d1f3cd178a0347c2885]

old_revision [1757e82b3ed17d8ad45db9d2c62f0187a8bee93d]

patch "doc/gtkconv-signals.dox"
 from [a2ad686aa3f6fd0053f2e4ecca0d4e5a3db57443]
   to [778a63ff9dacb5decff294d9fa52c6339a78c3a2]

old_revision [3d1e069061da093a2d8773199e5938f384f2e9f1]

add_dir "pidgin/pixmaps/toolbar/11"

add_file "libpurple/protocols/bonjour/dns_sd_proxy.c"
 content [1ff2db7339997a3b2a855a82652148cb085009aa]

add_file "pidgin/pixmaps/status/11/log-in.png"
 content [0be4a0be280cce09c33ae144538a098abfe260ab]

add_file "pidgin/pixmaps/status/11/log-out.png"
 content [e201025bec5d6e617f6803194d47bcf687b9adc7]

add_file "pidgin/pixmaps/toolbar/11/message-new.png"
 content [e38d4bfbcfc15be6bf236e0590521a0bae7de169]

add_file "share/ca-certs/Microsoft_Secure_Server_Authority.pem"
 content [e1a29b84c3814767aa6bfc86f534fc7cdd70bbe6]

patch "INSTALL"
 from [5b39563912c3e0289a4ea052735e1566b07c513f]
   to [5b95c09a698796c0ab180f4e71e856042081ebac]

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

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

patch "finch/libgnt/gntbindable.h"
 from [c7f0d7631b1812dbc272cd2f7889852d7cf1687e]
   to [9e7af7ad9534107c652956dcfc02af39efb20f84]

patch "finch/libgnt/gntbutton.h"
 from [8d03f675f0d77ed44f37f4a648fdde6b5118658e]
   to [8789e04c4d75a065a24ca72e720b31fd097dd585]

patch "finch/libgnt/gntcheckbox.h"
 from [d8e412ff6e8ada6ecaa9ce0f01109da81611980e]
   to [fff8464fe79209f1790f992800870550149bee56]

patch "finch/libgnt/gntclipboard.c"
 from [c0aeee7c1c44622b6de257752bd5664230ef6091]
   to [169146375a165989f6508edaf72b7b2d7c658841]

patch "finch/libgnt/gntclipboard.h"
 from [ff8c8e7fb0dde8d5ecc95952974335e77bcba480]
   to [cbc2b477936324240e0839e9ac3a4a1337bccefe]

patch "finch/libgnt/gntcolors.h"
 from [038facbccf708c3afeb120ddb17586e6fc6b4f9b]
   to [04bc7db0d7de7d04ad866ce58e3dafdf87631b9c]

patch "finch/libgnt/gntcombobox.h"
 from [895096dc4eeb8ebd346941ebaac9396d61a4f7dd]
   to [27995b038d1188529b6fd288f83797b78242d115]

patch "finch/libgnt/gntentry.h"
 from [f4c7cfef2c64b878104956a8a4e48d7b887fbb53]
   to [15a838de46a2fe83c482899079bbbad5cf86e956]

patch "finch/libgnt/gntmain.c"
 from [681d2e87ecf9a093e70f4c6a7dba4c345a0a5e07]
   to [7ddfbc8f64142c8b3f27e408710c3e096e961fdd]

patch "finch/libgnt/gnttree.c"
 from [b6c0451cf023872b06f6a3317ff057dfaa88942f]
   to [be8a77ee722c4615fac5656740ba2a20ecf8d3cf]

patch "libpurple/certificate.c"
 from [e92bb3478e85c939e696305a5286afb1b4069c19]
   to [950f284fa04c1cf3515cf50503deb9d55f8fd59e]

patch "libpurple/dnsquery.c"
 from [e3aec839245d62f0f23611a9e668b88dc73ff2ce]
   to [0ddd5e827518101947da5f67acc3b436926f83bc]

patch "libpurple/plugins/log_reader.c"
 from [534e7453f5bc02fcbb0657e583bafb58597d38c7]
   to [bb60965d92b317d2cb41e929c14b1da60b21b08e]

patch "libpurple/protocols/bonjour/Makefile.am"
 from [90d47f9af47c6f91ae2437b6776523064549ca32]
   to [66528f8cacc25d2764e00f74003ed1fa14e095da]

patch "libpurple/protocols/bonjour/Makefile.mingw"
 from [d854d40f013c09f8f07c4674c9905b77d6b750b3]
   to [68142a3871b3bcb2be7229170c4bc8ea4fd13943]

patch "libpurple/protocols/bonjour/bonjour.c"
 from [4bf190ec74fffd44c858abfabab31e1cd8cbfa18]
   to [64780fa8de009d3f0535aae3bc3d10505be400da]

patch "libpurple/protocols/bonjour/dns_sd_proxy.h"
 from [5c8bb1f2d994ebfb1554d95a18b59601a1f06e4b]
   to [ef8b2066d3abc473afaf1119d6b7589fbfa2d704]

patch "libpurple/protocols/bonjour/mdns_win32.c"
 from [03e5cd92236058b8970463c7932950f7a356c058]
   to [6730940435f462ce704c44ed84d38ee2baafbd90]

patch "libpurple/protocols/gg/buddylist.c"
 from [aa1eb8a29f943a90c6fb14c0f6934123fc6b8730]
   to [353535de7d31ded3a69e0486d86d6d22604f31e6]

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

patch "libpurple/protocols/jabber/presence.c"
 from [2b25212d8c6b6df2aeef8dd484660bff573c3511]
   to [0ef2f63adee86173f85649a3f9fb573cdec663e6]

patch "libpurple/protocols/msn/command.c"
 from [c254fc39b9eafaf8b9234da61716d44621c66e94]
   to [0fffb877a0b4f19b52625fc3a120bb2fed65817e]

patch "libpurple/protocols/msn/contact.c"
 from [237bd2df0ea6cfdc4751fed4cc3ef2bd54db66db]
   to [905e9168592f380c73e03a91627151daa85b077d]

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

patch "libpurple/protocols/msn/nexus.c"
 from [d9fa147a49267475bbbcfad3e859b02cc8f1d8bf]
   to [9bd63395fda2ec18e2fcbcfed61c1376c3d22903]

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

patch "libpurple/protocols/msn/oim.c"
 from [193865c5c46e2ba14f09d1addfd247c04ded2386]
   to [f9e705bd719c70b2aed9fa8f6644f64a1d417874]

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

patch "libpurple/protocols/msn/soap.c"
 from [b4246c343cc7a5051c673f14257ab0918a4db156]
   to [1fdfd8ef14b7f47f39a4c4f3df0ee68d74fe69d8]

patch "libpurple/protocols/msn/soap.h"
 from [77457a117e8c85f3cfa8930c8d4581a3ba586ca7]
   to [9557b05bcf075239f98d97a1a90d2c7469967bd2]

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

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

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

patch "libpurple/protocols/myspace/user.c"
 from [cd376f03cc62872fe687b6585cd373130330d2fb]
   to [7b2c5dd1ac71ad9a756d53486dd35842accbfba3]

patch "libpurple/purple-remote"
 from [ba9eca8159997a15119270a88a7d0d194465107e]
   to [cedd9f61973784230e4b3c890d5161d571747955]

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

patch "pidgin/gtkstatusbox.c"
 from [0159519a9e593047e9a0495847b9e78f56a95c28]
   to [063b9de96460ac58e129b577249c979e0327eb60]

patch "pidgin/pidginstock.c"
 from [a1a460cffd8fa050434e5402f4800f561f2528c5]
   to [2c265aa9d5a211ec43e10e414febf9937bb03420]

patch "pidgin/pixmaps/status/11/Makefile.am"
 from [9a19ff6d6fcc1bb1b406d6407a095322e30e8c8b]
   to [206419b4c8fd3cec428f705dab89a09c27326636]

patch "pidgin/pixmaps/toolbar/Makefile.am"
 from [497746a6a16a636054c83cdb0f459206aa1ad609]
   to [c5081b872303b49b303ca69d9ae94176f98e00e1]

patch "pidgin/plugins/gestures/stroke-draw.c"
 from [d754821b5eb626dad91eaa659c9ac876065fa4c8]
   to [4101ccfbfe98a8cbb102e75bbf06d076b276962a]

patch "pidgin/plugins/ticker/ticker.c"
 from [2bf14a25600b39ff900ed8068b27d0082a16ff9c]
   to [41b7b32fce7a2847c78106e1fcd999fd5ef73271]

patch "pidgin/plugins/win32/transparency/win2ktrans.c"
 from [1dc7f0732a31648b1da695f250d2161044ac7fbc]
   to [9601ee40bdec944b0d0a863416b2d6ccf54f3614]

patch "pidgin/plugins/win32/winprefs/gtkappbar.c"
 from [fd5ebb154ecb203e19e9e60b43fecd612a669cc1]
   to [e1276ea68676a28de5d4097d1cdf82ac89a6cb4f]

patch "pidgin/win32/nsis/pixmaps/pidgin-intro.bmp"
 from [743fe3b36d453397c445fe08ea301f9163b07923]
   to [a286d035366a6522fa166cc53fcbfbaa2f2de370]

patch "po/ChangeLog"
 from [520ee146dab1fcab40a6ba616f5be58fdca2d5f1]
   to [ed72aafbc39ededf577ea5640c964a4c20106c39]

patch "po/sk.po"
 from [99ff35c5aec6de7b1ee5f851fda8dd0a1e479fdb]
   to [488f79ae24305085098bb86c8ce5d08d157018ca]

patch "share/ca-certs/Makefile.am"
 from [6fdd6599e29bf50e32832da473dbfea86f59cde8]
   to [d33109c71b83ea1f09f3df5b78fcbdb6ebe94232]

  set "pidgin/pixmaps/status/11/log-in.png"
 attr "mtn:manual_merge"
value "true"

  set "pidgin/pixmaps/status/11/log-out.png"
 attr "mtn:manual_merge"
value "true"

  set "pidgin/pixmaps/toolbar/11/message-new.png"
 attr "mtn:manual_merge"
value "true"