Jacques Vidrine
|
43a2371256
|
Resolve conflicts.
|
2002-09-16 21:07:11 +00:00 |
|
Jacques Vidrine
|
bc865db654
|
Resolve conflicts after import of Heimdal Kerberos 2002/02/17.
|
2002-02-19 15:50:30 +00:00 |
|
Assar Westerlund
|
c80b5a6353
|
fix merges from 0.3f
|
2001-06-21 02:21:57 +00:00 |
|
Assar Westerlund
|
47085b17ae
|
fix conflicts in heimdal 0.3e import
|
2001-02-13 16:52:56 +00:00 |
|
Mark Murray
|
8ceb13ade4
|
Merge conflicts.
|
2000-02-24 13:37:41 +00:00 |
|
Mark Murray
|
13e3f4d6d9
|
Vendor import of Heimdal 0.2n
|
2000-02-24 11:07:16 +00:00 |
|
Mark Murray
|
b528cefc6b
|
Import KTH Heimdal, which will be the core of our Kerberos5.
Userland to follow.
|
2000-01-09 20:58:00 +00:00 |
|