comparison pidgin.desktop.in @ 17885:31e6668f3a24

merge of '6e3524da31024398852895df04c5bda7269003af' and 'b20fe3f85060e3f1f285f85731ca9257fe294d89'
author Nathan Walp <nwalp@pidgin.im>
date Fri, 15 Jun 2007 16:35:38 +0000
parents ed4ea63c0b45
children 394a6c9b592c 1694eb347a78
comparison
equal deleted inserted replaced
17884:234ab2c9ed36 17885:31e6668f3a24