From owner-cvs-user  Mon Dec  9 01:29:26 1996
Return-Path: <owner-cvs-user>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.4/8.8.4) id BAA22960
          for cvs-user-outgoing; Mon, 9 Dec 1996 01:29:26 -0800 (PST)
Received: (from jkh@localhost)
          by freefall.freebsd.org (8.8.4/8.8.4) id BAA22951;
          Mon, 9 Dec 1996 01:29:23 -0800 (PST)
Date: Mon, 9 Dec 1996 01:29:23 -0800 (PST)
From: "Jordan K. Hubbard" <jkh>
Message-Id: <199612090929.BAA22951@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-user
Subject: cvs commit:  src/release/sysinstall anonFTP.c apache.c attr.c config.c devices.c dmenu.c ftp_strat.c index.c label.c media.c misc.c msg.c network.c sysinstall.h tcpip.c uc_main.c variable.c
Sender: owner-cvs-user@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

jkh         96/12/09 01:29:23

  Branch:      release/sysinstall  RELENG_2_2
  Modified:    release/sysinstall  anonFTP.c apache.c attr.c config.c
                        devices.c dmenu.c  ftp_strat.c index.c label.c
                        media.c misc.c msg.c network.c  sysinstall.h
                        tcpip.c uc_main.c variable.c
  Log:
  Merge-o-matic.
  
  Revision  Changes    Path
  1.17.2.1  +9 -9      src/release/sysinstall/anonFTP.c
  1.27.2.3  +16 -16    src/release/sysinstall/apache.c
  1.8.2.1   +3 -3      src/release/sysinstall/attr.c
  1.51.2.11 +3 -3      src/release/sysinstall/config.c
  1.49.2.4  +2 -2      src/release/sysinstall/devices.c
  1.25.2.3  +2 -2      src/release/sysinstall/dmenu.c
  1.29.2.1  +2 -2      src/release/sysinstall/ftp_strat.c
  1.38.2.1  +3 -3      src/release/sysinstall/index.c
  1.63.2.1  +3 -3      src/release/sysinstall/label.c
  1.62.2.5  +2 -2      src/release/sysinstall/media.c
  1.22.2.1  +9 -1      src/release/sysinstall/misc.c
  1.41.2.1  +2 -2      src/release/sysinstall/msg.c
  1.16.2.4  +8 -6      src/release/sysinstall/network.c
  1.82.2.7  +3 -0      src/release/sysinstall/sysinstall.h
  1.48.2.3  +18 -20    src/release/sysinstall/tcpip.c
  1.13.4.1  +4 -6      src/release/sysinstall/uc_main.c
  1.11.2.1  +5 -5      src/release/sysinstall/variable.c