Mercurial > pidgin
diff pidgin.desktop.in @ 26132:edd2cebdead8
Manual merging...
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 19:47:17 +0000 |
parents | ed4ea63c0b45 |
children | 394a6c9b592c 1694eb347a78 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 19:47:17 +0000 |
parents | ed4ea63c0b45 |
children | 394a6c9b592c 1694eb347a78 |