comparison finch/finch.c @ 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 49d51dbcb799
children 1d3274111180
comparison
equal deleted inserted replaced
26735:3912f55a1633 26736:a0e48796defb