comparison pidgin.desktop.in @ 23418:ded0a9cf1785

merge of '3d0b19df4a52ab42b61494afac9c85d170398fa8' and '9017d2519c3dbbb02402b0785a4750aab2e18a56'
author Will Thompson <will.thompson@collabora.co.uk>
date Thu, 03 Jul 2008 14:51:52 +0000
parents ed4ea63c0b45
children 394a6c9b592c 1694eb347a78
comparison
equal deleted inserted replaced
23414:1ca49b349037 23418:ded0a9cf1785