From owner-cvs-user  Mon Nov  4 05:09:58 1996
Return-Path: owner-cvs-user
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id FAA13925
          for cvs-user-outgoing; Mon, 4 Nov 1996 05:09:58 -0800 (PST)
Received: (from jkh@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id FAA13858;
          Mon, 4 Nov 1996 05:09:03 -0800 (PST)
Date: Mon, 4 Nov 1996 05:09:03 -0800 (PST)
From: "Jordan K. Hubbard" <jkh>
Message-Id: <199611041309.FAA13858@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-user
Subject: cvs commit:  src/release/sysinstall config.c dispatch.c install.c menus.c samba.c sysinstall.h
Sender: owner-cvs-user@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

jkh         96/11/04 05:09:02

  Branch:      release/sysinstall  RELENG_2_1_0
  Modified:    release/sysinstall  config.c dispatch.c install.c menus.c
                        samba.c sysinstall.h
  Log:
  merge-o-matic.  I may have to update some packages in 2.1.6 myself
  if it comes down to it, but not that many.  BTW, in case it's not
  obvious, I'm mostly merging away in -stable while phk and joerg do the
  2.2-current merging for now.  I'm getting 2.1.6 out of the way so that
  I can concentrate on 2.2.
  
  Revision  Changes    Path
  1.16.2.62 +38 -23    src/release/sysinstall/config.c
  1.1.2.6   +2 -2      src/release/sysinstall/dispatch.c
  1.71.2.107 +3 -3      src/release/sysinstall/install.c
  1.42.2.66 +4 -7      src/release/sysinstall/menus.c
  1.3.2.6   +2 -2      src/release/sysinstall/samba.c
  1.42.2.69 +12 -5     src/release/sysinstall/sysinstall.h