From owner-cvs-user  Sun Nov 10 05:15:16 1996
Return-Path: owner-cvs-user
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id FAA07808
          for cvs-user-outgoing; Sun, 10 Nov 1996 05:15:16 -0800 (PST)
Received: (from jkh@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id FAA07790;
          Sun, 10 Nov 1996 05:15:05 -0800 (PST)
Date: Sun, 10 Nov 1996 05:15:05 -0800 (PST)
From: "Jordan K. Hubbard" <jkh>
Message-Id: <199611101315.FAA07790@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-user
Subject: cvs commit:  src/release Makefile fixit.profile fixit_crunch.conf src/release/sysinstall config.c disks.c dist.c dist.h dmenu.c install.c menus.c sysinstall.h
Sender: owner-cvs-user@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

jkh         96/11/10 05:15:03

  Branch:      release   RELENG_2_1_0
               release/sysinstall  RELENG_2_1_0
  Modified:    release   Makefile fixit.profile fixit_crunch.conf
               release/sysinstall  config.c disks.c dist.c dist.h dmenu.c
                        install.c menus.c  sysinstall.h
  Log:
  Another merge from HEAD before rolling a 2.1.6 release candidate
  (Tuesday is still the cut-off date for bug fixes!).
  
  Revision  Changes    Path
  1.193.2.63 +15 -8     src/release/Makefile
  1.1.4.1   +23 -8     src/release/fixit.profile
  1.3.4.10  +6 -6      src/release/fixit_crunch.conf
  1.16.2.65 +7 -8      src/release/sysinstall/config.c
  1.31.2.52 +2 -1      src/release/sysinstall/disks.c
  1.36.2.43 +52 -52    src/release/sysinstall/dist.c
  1.5.2.9   +0 -3      src/release/sysinstall/dist.h
  1.12.2.18 +21 -1     src/release/sysinstall/dmenu.c
  1.71.2.109 +13 -6     src/release/sysinstall/install.c
  1.42.2.69 +722 -722  src/release/sysinstall/menus.c
  1.42.2.72 +8 -2      src/release/sysinstall/sysinstall.h