Jacques Vidrine a0c37ec326 Resolve conflicts after import of Heimdal 0.6.1.

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

..

kpasswd_locl.h

…

kpasswd-generator.c

…

kpasswd.1

…

kpasswd.c

…

kpasswdd.8

…

kpasswdd.c

…

Makefile.am

…

Makefile.in

…