From owner-cvs-user  Mon Jul  8 03:20:28 1996
Return-Path: owner-cvs-user
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id DAA23521
          for cvs-user-outgoing; Mon, 8 Jul 1996 03:20:28 -0700 (PDT)
Received: (from jkh@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id DAA23506;
          Mon, 8 Jul 1996 03:20:19 -0700 (PDT)
Date: Mon, 8 Jul 1996 03:20:19 -0700 (PDT)
From: "Jordan K. Hubbard" <jkh>
Message-Id: <199607081020.DAA23506@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-user
Subject: cvs commit:  src/release/sysinstall dist.c ftp.c ftp_strat.c install.c media.c network.c sysinstall.h tcpip.c
Sender: owner-cvs-user@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

jkh         96/07/08 03:20:18

  Branch:      release/sysinstall  RELENG_2_1_0
  Modified:    release/sysinstall  dist.c ftp.c ftp_strat.c install.c
                        media.c network.c  sysinstall.h tcpip.c
  Log:
  merge-o-matic.
  
  Revision  Changes    Path
  1.36.2.34 +3 -3      src/release/sysinstall/dist.c
  1.14.2.7  +6 -6      src/release/sysinstall/ftp.c
  1.7.2.49  +13 -80    src/release/sysinstall/ftp_strat.c
  1.71.2.99 +1 -3      src/release/sysinstall/install.c
  1.25.2.38 +2 -22     src/release/sysinstall/media.c
  1.7.2.24  +20 -8     src/release/sysinstall/network.c
  1.42.2.64 +2 -5      src/release/sysinstall/sysinstall.h
  1.30.2.26 +9 -5      src/release/sysinstall/tcpip.c