diff pidgin.desktop.in @ 16992:667a5a24781c

merge of '5fba6dfb4d0356ca98aa9a0c99c95135225f56db' and 'cf675877fb02f3868c22d6bcf0141011ac7b098e'
author Nathan Walp <nwalp@pidgin.im>
date Thu, 10 May 2007 02:55:42 +0000
parents ed4ea63c0b45
children 394a6c9b592c 1694eb347a78
line wrap: on
line diff