From owner-cvs-user  Sun Apr 20 09:42:26 1997
Return-Path: <owner-cvs-user>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id JAA29981
          for cvs-user-outgoing; Sun, 20 Apr 1997 09:42:26 -0700 (PDT)
Received: (from jkh@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id JAA29972;
          Sun, 20 Apr 1997 09:42:24 -0700 (PDT)
Date: Sun, 20 Apr 1997 09:42:24 -0700 (PDT)
From: "Jordan K. Hubbard" <jkh>
Message-Id: <199704201642.JAA29972@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-user
Subject: cvs commit:  src/release/sysinstall Makefile config.c disks.c dist.c dist.h globals.c main.c menus.c msg.c sysinstall.h variable_load.c
Sender: owner-cvs-user@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

jkh         97/04/20 09:42:24

  Branch:      release/sysinstall  RELENG_2_1_0
  Modified:    release/sysinstall  Makefile config.c disks.c dist.c dist.h
                        globals.c main.c  menus.c msg.c sysinstall.h
                        variable_load.c
  Log:
  Merge changes from 2.2 (not really necessary, but it helps me keep
  track of all this).
  
  Revision  Changes    Path
  1.22.2.24 +1 -0      src/release/sysinstall/Makefile
  1.16.2.78 +51 -4     src/release/sysinstall/config.c
  1.31.2.54 +8 -2      src/release/sysinstall/disks.c
  1.36.2.50 +33 -4     src/release/sysinstall/dist.c
  1.5.2.12  +8 -2      src/release/sysinstall/dist.h
  1.10.2.11 +2 -1      src/release/sysinstall/globals.c
  1.13.2.30 +14 -3     src/release/sysinstall/main.c
  1.42.2.81 +34 -10    src/release/sysinstall/menus.c
  1.29.2.21 +1 -4      src/release/sysinstall/msg.c
  1.42.2.83 +7 -5      src/release/sysinstall/sysinstall.h
  1.1.4.2   +6 -4      src/release/sysinstall/variable_load.c