Commit Graph

5 Commits

Author SHA1 Message Date
Mark Murray
f4083b2413 Resolve conflicts. 2002-03-21 23:42:52 +00:00
Kris Kennaway
0d845f9706 Resolve conflicts 2000-04-10 11:18:54 +00:00
Andrey A. Chernov
e9fcc517e1 Merge 1997-09-29 10:33:14 +00:00
Paul Traina
0e719bd969 Minimal man page changes to reflect integrated ftpd/login/su 1997-02-07 03:46:00 +00:00
Paul Traina
3c491303b5 Initial import of OPIE v2.3 from
ftp://ftp.nrl.navy.mil/pub/security/opie/
1997-02-06 17:52:29 +00:00