Assar Westerlund 6e3caa0833 fix conflicts from merge

2000-12-29 21:16:01 +00:00

..

common.c

import krb4-1.0.5

2000-12-29 21:00:22 +00:00

kip-join-network.in

import krb4-1.0.5

2000-12-29 21:00:22 +00:00

kip.c

import krb4-1.0.5

2000-12-29 21:00:22 +00:00

kip.h

import krb4-1.0.5

2000-12-29 21:00:22 +00:00

kipd-control.in

import krb4-1.0.5

2000-12-29 21:00:22 +00:00

kipd.c

fix conflicts from merge

2000-12-29 21:16:01 +00:00

Makefile.in

import krb4-1.0.5

2000-12-29 21:00:22 +00:00