summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/texinfo/Makefile.am
AgeCommit message (Expand)Author
2006-07-17conflict resolutionMarc Espie
2002-06-10brain-dead cvs conflict mergeMarc Espie
2000-02-09Merge conflicts, and a few details:Marc Espie
1999-01-11Upgrade to 3.12, merge with OpenBSD changes.Marc Espie
1997-08-01Import of FSF texinfo 3.11kstailey