More merge stuff.
authorJeff Law <law@gcc.gnu.org>
Sun, 22 Mar 1998 22:35:21 +0000 (15:35 -0700)
committerJeff Law <law@gcc.gnu.org>
Sun, 22 Mar 1998 22:35:21 +0000 (15:35 -0700)
commit34b6478b59f51c9d5b2b634ea0aefa6813cdbb2a
treeb7cee5292ee53741f0bc31e22fd7b26155c2854a
parentb19e662bb2109abc394beeb819bc7f65a9bd5ec1
More merge stuff.

From-SVN: r18769
texinfo/info/man.c
texinfo/makeinfo/makeinfo.c