From owner-cvs-user  Mon Jun 17 02:05:24 1996
Return-Path: owner-cvs-user
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id CAA02054
          for cvs-user-outgoing; Mon, 17 Jun 1996 02:05:24 -0700 (PDT)
Received: (from jkh@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id CAA02011;
          Mon, 17 Jun 1996 02:05:06 -0700 (PDT)
Date: Mon, 17 Jun 1996 02:05:06 -0700 (PDT)
From: "Jordan K. Hubbard" <jkh>
Message-Id: <199606170905.CAA02011@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-user
Subject: cvs commit:  src/release/sysinstall config.c ftp_strat.c media.c menus.c samba.c sysinstall.h
Sender: owner-cvs-user@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

jkh         96/06/17 02:05:05

  Branch:      release/sysinstall  RELENG_2_1_0
  Modified:    release/sysinstall  config.c ftp_strat.c media.c menus.c
                        samba.c sysinstall.h
  Log:
  Merge from HEAD
  
  Revision  Changes    Path
  1.16.2.52 +4 -2      src/release/sysinstall/config.c
  1.7.2.46  +7 -34     src/release/sysinstall/ftp_strat.c
  1.25.2.31 +46 -4     src/release/sysinstall/media.c
  1.42.2.53 +89 -18    src/release/sysinstall/menus.c
  1.3.2.1   +2 -1      src/release/sysinstall/samba.c
  1.42.2.57 +5 -1      src/release/sysinstall/sysinstall.h