christos 1a6788bb65 resolve conflicts.

2003-03-09 01:38:38 +00:00

..

am-eject.in

…

amd2ldif.in

…

amd2sun.in

…

amd.conf-sample

Import am-utils 6.1b2

2003-03-09 01:12:05 +00:00

amd.conf.5

resolve conflicts.

2003-03-09 01:38:38 +00:00

automount2amd.8

resolve conflicts.

2003-03-09 01:38:38 +00:00

automount2amd.in

…

ctl-amd.in

Import am-utils 6.1b2

2003-03-09 01:12:05 +00:00

ctl-hlfsd.in

…

expn.1

resolve conflicts.

2003-03-09 01:38:38 +00:00

expn.in

resolve conflicts.

2003-03-09 01:38:38 +00:00

fix-amd-map.in

…

fixrmtab.in

…

lostaltmail.conf-sample

…

lostaltmail.in

…

Makefile.am

…

Makefile.in

Import am-utils 6.1b2

2003-03-09 01:12:05 +00:00

redhat-ctl-amd.in

…

wait4amd2die.in

…

wait4amd.in

…