markm
|
b1b1c55467
|
Fix a "make world"-breaking inconsistency for those folks making
a world with both KRB4 and KRB5.
|
2001-02-14 19:54:36 +00:00 |
|
assar
|
c492c977b4
|
nuke conflict markers
|
2001-02-13 22:40:28 +00:00 |
|
assar
|
e1ae34cd7e
|
fix conflicts in heimdal 0.3e import
|
2001-02-13 16:52:56 +00:00 |
|
assar
|
ebfe6dc471
|
import of heimdal 0.3e
|
2001-02-13 16:46:19 +00:00 |
|
assar
|
3a971fe69a
|
This commit was generated by cvs2svn to compensate for changes in r72445,
which included commits to RCS files with non-trunk default branches.
|
2001-02-13 16:46:19 +00:00 |
|
markm
|
be16c6202a
|
Merge conflicts.
|
2000-02-24 13:37:41 +00:00 |
|
markm
|
5ed96cd5da
|
Vendor import of Heimdal 0.2p
|
2000-02-24 11:28:20 +00:00 |
|
markm
|
69414e22b9
|
Vendor import of Heimdal 0.2o
|
2000-02-24 11:19:29 +00:00 |
|
markm
|
fa8b1a96d3
|
Vendor import of Heimdal 0.2n
|
2000-02-24 11:07:16 +00:00 |
|
markm
|
4ecbd6db44
|
Import KTH Heimdal, which will be the core of our Kerberos5.
Userland to follow.
|
2000-01-09 20:58:00 +00:00 |
|