Commit [4bc3cc]  Maximize  Restore  History

Resolve conflicts from merge of `man-1.6' release.

Keith Marshall Keith Marshall 2005-08-22

changed ChangeLog
changed Makefile.in
changed man/Makefile.in
removed man/en/makewhatis.8
removed man/it/makewhatis.8
removed man/ro/makewhatis.8
changed man2html/Makefile.in
changed man2html/man2html.c
changed src/Makefile.in
changed src/gripes.c
changed src/man-config.c
changed src/man-getopt.c
changed src/man.c
changed src/man.conf.in
changed src/paths.h.in
changed src/util.c
ChangeLog Diff Switch to side-by-side view
Loading...
Makefile.in Diff Switch to side-by-side view
Loading...
man/Makefile.in Diff Switch to side-by-side view
Loading...
man/en/makewhatis.8
File was removed.
man/it/makewhatis.8
File was removed.
man/ro/makewhatis.8
File was removed.
man2html/Makefile.in Diff Switch to side-by-side view
Loading...
man2html/man2html.c Diff Switch to side-by-side view
Loading...
src/Makefile.in Diff Switch to side-by-side view
Loading...
src/gripes.c Diff Switch to side-by-side view
Loading...
src/man-config.c Diff Switch to side-by-side view
Loading...
src/man-getopt.c Diff Switch to side-by-side view
Loading...
src/man.c Diff Switch to side-by-side view
Loading...
src/man.conf.in Diff Switch to side-by-side view
Loading...
src/paths.h.in Diff Switch to side-by-side view
Loading...
src/util.c Diff Switch to side-by-side view
Loading...