espie c6287b2b53 fix @conflict marker ... while there, put common things in Makefile.inc bump revs according to discrepancies in COMMENT and in @conflict		2012-06-25 15:45:14 +00:00
..
patches	Make all info patches consistent so info files can be installed without	2010-07-22 12:08:58 +00:00
pkg	fix @conflict marker	2012-06-25 15:45:14 +00:00
distinfo
Makefile	fix @conflict marker	2012-06-25 15:45:14 +00:00