From owner-cvs-user  Mon Jun 17 14:58:26 1996
Return-Path: owner-cvs-user
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id OAA03437
          for cvs-user-outgoing; Mon, 17 Jun 1996 14:58:26 -0700 (PDT)
Received: (from jkh@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id OAA03409;
          Mon, 17 Jun 1996 14:58:03 -0700 (PDT)
Date: Mon, 17 Jun 1996 14:58:03 -0700 (PDT)
From: "Jordan K. Hubbard" <jkh>
Message-Id: <199606172158.OAA03409@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-user
Subject: cvs commit:  src/release/sysinstall ftp_strat.c media.c misc.c sysinstall.h
Sender: owner-cvs-user@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

jkh         96/06/17 14:58:01

  Branch:      release/sysinstall  RELENG_2_1_0
  Modified:    release/sysinstall  ftp_strat.c media.c misc.c sysinstall.h
  Log:
  Merge (again!)
  
  Revision  Changes    Path
  1.7.2.47  +3 -10     src/release/sysinstall/ftp_strat.c
  1.25.2.32 +12 -2     src/release/sysinstall/media.c
  1.12.2.14 +11 -1     src/release/sysinstall/misc.c
  1.42.2.58 +3 -1      src/release/sysinstall/sysinstall.h