3 Commits

Author	SHA1	Message	Date
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
ajacoutot	a7843c3581	Update to automake-1.11.3, from Brad. ... Add missing @conflict marker.	2012-02-22 07:14:20 +00:00
jasper	3117666d96	import automake 1.11.1 ... ok sthen@	2011-05-05 18:55:34 +00:00