Assar Westerlund 6e3caa0833 fix conflicts from merge		2000-12-29 21:16:01 +00:00
..
common
ftp	This commit was generated by cvs2svn to compensate for changes in r70494,	2000-12-29 21:00:22 +00:00
ftpd	fix conflicts from merge	2000-12-29 21:16:01 +00:00
ChangeLog	import krb4-1.0.5	2000-12-29 21:00:22 +00:00
Makefile.am
Makefile.in