From owner-cvs-all  Mon Jun 21 19: 9:18 1999
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 9864914C11; Mon, 21 Jun 1999 19:09:14 -0700 (PDT)
	(envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id TAA42519;
	Mon, 21 Jun 1999 19:09:14 -0700 (PDT)
	(envelope-from imp@FreeBSD.org)
Message-Id: <199906220209.TAA42519@freefall.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 21 Jun 1999 19:09:14 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/etc pccard_ether_remove rc.conf.local.sample
         Makefile pccard.conf.sample pccard_ether rc.pccard
         src/etc/defaults rc.conf
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

imp         1999/06/21 19:09:13 PDT

  Modified files:        (Branch: RELENG_3_2_PAO)
    etc                  Makefile pccard.conf.sample pccard_ether 
                         rc.pccard 
    etc/defaults         rc.conf 
  Added files:           (Branch: RELENG_3_2_PAO)
    etc                  pccard_ether_remove rc.conf.local.sample 
  Log:
  Merge /etc/Makefile from PAO3-19990605 into Makefile.
  Merge other changes from said PAO3 version.
  
  Obtained from:	PAO3-19990605.tar.gz
  
  Revision  Changes    Path
  1.187.2.6.2.1 +3 -2      src/etc/Makefile
  1.24.2.7.2.1 +1401 -432 src/etc/pccard.conf.sample
  1.9.2.2.2.1 +58 -31    src/etc/pccard_ether
  1.6.2.4.2.1 +37 -15    src/etc/rc.pccard
  1.1.2.5.2.1 +13 -7     src/etc/defaults/rc.conf



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message