diff ChangeLog.API @ 26818: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 83e6e710cbf3
children 89f613b16e2b
line wrap: on
line diff