comparison pidgin.desktop.in @ 23676:b33b5e56a482

merge of '0d858a8978355a1e8b7305b64b87db51e44e9978' and '4837767868c0defe45efc50e8d0639be2ed4ad7d'
author Ethan Blanton <elb@pidgin.im>
date Fri, 01 Aug 2008 19:45:08 +0000
parents ed4ea63c0b45
children 394a6c9b592c 1694eb347a78
comparison
equal deleted inserted replaced
23675:46cc31494ff4 23676:b33b5e56a482