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	Update to automake-1.11.4.	2012-04-08 07:12:56 +00:00
pkg	fix @conflict marker	2012-06-25 15:45:14 +00:00
distinfo	Update to automake-1.11.5.	2012-04-23 08:01:14 +00:00
Makefile	fix @conflict marker	2012-06-25 15:45:14 +00:00