steven bc17ceaea0 add conflict markers where appropriate, and a missing BUILD_DEPENDS ... from Landry Breuil		2007-05-14 06:44:36 +00:00
..
pkg	add conflict markers where appropriate, and a missing BUILD_DEPENDS	2007-05-14 06:44:36 +00:00
distinfo
Makefile	add conflict markers where appropriate, and a missing BUILD_DEPENDS	2007-05-14 06:44:36 +00:00