Commit Graph

9 Commits

Author SHA1 Message Date
christos 8e2da38978 Remove duplicate definitions caused by the merge. 1999-02-01 19:56:18 +00:00
christos a2b1d050d6 Resolve corn-flakes. 1999-02-01 19:05:09 +00:00
christos ac8587765d Resolve corn-flakes and remove obsolete files 1998-08-08 22:33:27 +00:00
fvdl 6559ed7a58 Fix these for ufs/ufs/ufsmount.h usage. Missed in the merge. 1998-03-01 23:48:58 +00:00
christos 1815a8d4a4 Resolve RCSID conflicts; hopefully this is the last time :-) 1997-10-26 00:24:41 +00:00
christos 5d124d82c6 Resolve conflicts; Damned RCSid's... I should fix the amd2netbsd script
to strip them.
1997-09-26 16:59:40 +00:00
christos 2903fbdf71 Resolve conflicts. 1997-09-22 22:09:51 +00:00
christos eab39f597e Commit am-utils6.0a8 1997-07-24 23:16:10 +00:00
christos 5feec48523 Import of Erez Zadok's am-utils 1997-07-24 21:19:53 +00:00