comparison pidgin.desktop.in @ 21331:6e23ec8b1634

merge of '0f99eebc17d3efab8dac3d72feb857ab25b06cb7' and 'a179eb8d8fc4c8bc156bdf775c617e04119282da'
author Stu Tomlinson <stu@nosnilmot.com>
date Sun, 11 Nov 2007 18:11:46 +0000
parents ed4ea63c0b45
children 394a6c9b592c 1694eb347a78
comparison
equal deleted inserted replaced
21327:48c6c89a8158 21331:6e23ec8b1634