From owner-cvs-all Tue May 19 15:58:11 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id PAA09151 for cvs-all-outgoing; Tue, 19 May 1998 15:58:11 -0700 (PDT) (envelope-from owner-cvs-all@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id PAA09095; Tue, 19 May 1998 15:58:01 -0700 (PDT) (envelope-from julian@FreeBSD.org) From: Julian Elischer Received: (from julian@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id PAA07039; Tue, 19 May 1998 15:53:30 -0700 (PDT) Date: Tue, 19 May 1998 15:53:30 -0700 (PDT) Message-Id: <199805192253.PAA07039@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG Subject: cvs commit: src/contrib/sys/softupdates - Imported sources Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk julian 1998/05/19 15:53:29 PDT src/contrib/sys/softupdates - Imported sources Update of /home/ncvs/src/contrib/sys/softupdates In directory freefall.freebsd.org:/tmp/cvs-serv6991 Log Message: Bring in Kirk's Feb 20 version of ffs_softdep.c where we merged our sources.. His version 9.23 == our version 1.5 of ffs_softdep.c His version 9.5 == our version 1.4 of softdep.h Status: Vendor Tag: McKusick Release Tags: Feb20-98-ALPHA U src/contrib/sys/softupdates/README C src/contrib/sys/softupdates/ffs_softdep.c U src/contrib/sys/softupdates/softdep.h 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jMcKusick:yesterday -jMcKusick src/contrib/sys/softupdates To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message