Jacques Vidrine a0c37ec326 Resolve conflicts after import of Heimdal 0.6.1.

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

..

common.c

…

convert_db.c

…

db3.c

Vendor import of Heimdal 0.6.1.

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

db.c

…

hdb_err.et

…

hdb_locl.h

Resolve conflicts after import of Heimdal 0.6.1.

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

hdb-ldap.c

Vendor import of Heimdal 0.6.1.

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

hdb-private.h

…

hdb-protos.h

…

hdb.asn1

…

hdb.c

…

hdb.h

…

keytab.c

…

Makefile.am

Vendor import of Heimdal 0.6.1.

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

Makefile.in

Vendor import of Heimdal 0.6.1.

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

mkey.c

…

ndbm.c

…

print.c

…