comparison pidgin.desktop.in @ 17263:0409947da92f

merge of '1f2b180ddf79376f0e3e803ced552148335c08b4' and 'e16446bdb94621a60e1687269cf6a0bb0b0d5a45'
author Jeffrey Connelly <jaconnel@calpoly.edu>
date Thu, 31 May 2007 02:17:23 +0000
parents ed4ea63c0b45
children 394a6c9b592c 1694eb347a78
comparison
equal deleted inserted replaced
17262:8a7238fb7905 17263:0409947da92f