From owner-cvs-user  Wed May 21 15:53:03 1997
Return-Path: <owner-cvs-user>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id PAA12593
          for cvs-user-outgoing; Wed, 21 May 1997 15:53:03 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id PAA12477;
          Wed, 21 May 1997 15:51:21 -0700 (PDT)
From: Satoshi Asami <asami@FreeBSD.ORG>
Received: (from asami@localhost)
	by freefall.freebsd.org (8.8.5/8.8.5) id PAA03105;
	Wed, 21 May 1997 15:51:20 -0700 (PDT)
Date: Wed, 21 May 1997 15:51:20 -0700 (PDT)
Message-Id: <199705212251.PAA03105@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-user@FreeBSD.ORG
Subject: cvs commit: src Makefile
Sender: owner-cvs-user@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

asami       1997/05/21 15:51:20 PDT

  Modified files:        (Branch:  RELENG_2_2)
    .                    Makefile 
  Log:
  Merge 1.126 and 1.127.
  
  Revision  Changes    Path
  1.109.2.5 +7 -7      src/Makefile