bernd 170c5e0493 Add @conflict markers. ok jasper@		2007-05-07 08:45:22 +00:00
..
patches	build w/ gcc2	2006-02-05 02:08:53 +00:00
pkg	Add @conflict markers. ok jasper@	2007-05-07 08:45:22 +00:00
distinfo	more base64 checksums	2007-04-05 17:36:18 +00:00
Makefile	Add @conflict markers. ok jasper@	2007-05-07 08:45:22 +00:00