diff pidgin.desktop.in @ 26736:a0e48796defb

Fix merging. I blame meld and the fact I didn't `mtn copy buddy.c useravatar.c`.
author Paul Aurich <paul@darkrain42.org>
date Tue, 28 Apr 2009 18:57:47 +0000
parents ed4ea63c0b45
children 394a6c9b592c 1694eb347a78
line wrap: on
line diff