espie 09fd58c468 conflict		2004-12-30 01:01:37 +00:00
..
pkg	conflict	2004-12-30 01:01:37 +00:00
distinfo	update to 1.45	2004-11-16 01:26:01 +00:00
Makefile	conflict	2004-12-30 01:01:37 +00:00