#
7b173f65 |
| 30-Aug-2002 |
Jacques Vidrine <nectar@FreeBSD.org> |
Resolve conflicts after import of Heimdal Kerberos circa 2002/08/29.
|
#
8373020d |
| 30-Aug-2002 |
Jacques Vidrine <nectar@FreeBSD.org> |
Import of Heimdal Kerberos from KTH repository circa 2002/08/29.
|
Revision tags: release/4.6.2_cvs, release/4.6.2, release/4.6.1, release/4.6.0_cvs |
|
#
bc865db6 |
| 19-Feb-2002 |
Jacques Vidrine <nectar@FreeBSD.org> |
Resolve conflicts after import of Heimdal Kerberos 2002/02/17.
|
#
4137ff4c |
| 19-Feb-2002 |
Jacques Vidrine <nectar@FreeBSD.org> |
Import of Heimdal Kerberos from KTH repository circa 2002/02/17.
|
Revision tags: release/4.5.0_cvs, release/4.4.0_cvs |
|
#
c80b5a63 |
| 21-Jun-2001 |
Assar Westerlund <assar@FreeBSD.org> |
fix merges from 0.3f
|
#
adb0ddae |
| 21-Jun-2001 |
Assar Westerlund <assar@FreeBSD.org> |
import of heimdal 0.3f
|
Revision tags: release/4.3.0_cvs, release/4.3.0 |
|
#
0346cda4 |
| 13-Feb-2001 |
Assar Westerlund <assar@FreeBSD.org> |
nuke conflict markers
|
#
47085b17 |
| 13-Feb-2001 |
Assar Westerlund <assar@FreeBSD.org> |
fix conflicts in heimdal 0.3e import
|
#
5e9cd1ae |
| 13-Feb-2001 |
Assar Westerlund <assar@FreeBSD.org> |
import of heimdal 0.3e
|
Revision tags: release/4.2.0, release/4.1.1_cvs, release/4.1.0, release/3.5.0_cvs, release/4.0.0_cvs |
|
#
8ceb13ad |
| 24-Feb-2000 |
Mark Murray <markm@FreeBSD.org> |
Merge conflicts.
|
#
b528cefc |
| 09-Jan-2000 |
Mark Murray <markm@FreeBSD.org> |
Import KTH Heimdal, which will be the core of our Kerberos5. Userland to follow.
|
#
5f1c68f7 |
| 09-Jan-2000 |
Mark Murray <markm@FreeBSD.org> |
This commit was generated by cvs2svn to compensate for changes in r55682, which included commits to RCS files with non-trunk default branches.
|