Jacques Vidrine a0c37ec326 Resolve conflicts after import of Heimdal 0.6.1.

2004-04-03 21:31:10 +00:00

..

524.c

…

config.c

Vendor import of Heimdal 0.6.1.

2004-04-03 21:22:55 +00:00

connect.c

Vendor import of Heimdal 0.6.1.

2004-04-03 21:22:55 +00:00

headers.h

…

hprop.8

…

hprop.c

…

hprop.h

…

hpropd.8

…

hpropd.c

…

kadb.h

…

kaserver.c

Vendor import of Heimdal 0.6.1.

2004-04-03 21:22:55 +00:00

kdc_locl.h

Vendor import of Heimdal 0.6.1.

2004-04-03 21:22:55 +00:00

kdc.8

Vendor import of Heimdal 0.6.1.

2004-04-03 21:22:55 +00:00

kerberos4.c

Vendor import of Heimdal 0.6.1.

2004-04-03 21:22:55 +00:00

kerberos5.c

Vendor import of Heimdal 0.6.1.

2004-04-03 21:22:55 +00:00

kstash.8

…

kstash.c

…

log.c

…

main.c

…

Makefile.am

…

Makefile.in

Vendor import of Heimdal 0.6.1.

2004-04-03 21:22:55 +00:00

misc.c

…

mit_dump.c

…

rx.h

…

string2key.8

…

string2key.c

…

v4_dump.c

…