From owner-cvs-user  Tue Jul  9 07:37:18 1996
Return-Path: owner-cvs-user
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id HAA11292
          for cvs-user-outgoing; Tue, 9 Jul 1996 07:37:18 -0700 (PDT)
Received: (from jkh@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id HAA11276;
          Tue, 9 Jul 1996 07:37:14 -0700 (PDT)
Date: Tue, 9 Jul 1996 07:37:14 -0700 (PDT)
From: "Jordan K. Hubbard" <jkh>
Message-Id: <199607091437.HAA11276@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-user
Subject: cvs commit:  src/release/sysinstall dist.c ftp_strat.c install.c misc.c sysinstall.h src/release/sysinstall/help options.hlp
Sender: owner-cvs-user@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

jkh         96/07/09 07:37:13

  Branch:      release/sysinstall  RELENG_2_1_0
               release/sysinstall/help  RELENG_2_1_0
  Modified:    release/sysinstall  dist.c ftp_strat.c install.c misc.c
                        sysinstall.h
               release/sysinstall/help  options.hlp
  Log:
  Merge.
  
  Revision  Changes    Path
  1.36.2.35 +16 -13    src/release/sysinstall/dist.c
  1.7.2.50  +3 -5      src/release/sysinstall/ftp_strat.c
  1.71.2.101 +8 -10     src/release/sysinstall/install.c
  1.12.2.17 +15 -1     src/release/sysinstall/misc.c
  1.42.2.65 +3 -1      src/release/sysinstall/sysinstall.h
  1.1.2.13  +14 -0     src/release/sysinstall/help/options.hlp