5 Commits

Author	SHA1	Message	Date
Martin Blapp	0974e17d43	Resolve conflicts.	2003-09-02 15:42:57 +00:00
David E. O'Brien	ce802deb8d	Fix conflicts.	1999-09-15 05:45:17 +00:00
David E. O'Brien	f4208b7ea8	Merge our older Amd manpages with the new am-utils manpages. ... The am-utils manpages were un-mandocafied, un4.4BSD'ed with CSRG copyrights regressed to 1989. This work was done by Brian Handy who I am very greatful to. (only a few minor tweaks by me) Submitted by: Brian Handy <handy@lambic.physics.montana.edu>	1998-09-12 04:04:59 +00:00
David E. O'Brien	c2e6b42316	More sorting of references.	1998-09-05 06:56:36 +00:00
David E. O'Brien	ab38884b94	Virgin import of AMD (am-utils) v6.0a16	1998-08-23 22:07:21 +00:00