From owner-cvs-include  Tue Feb 27 11:42:53 1996
Return-Path: owner-cvs-include
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id LAA17256
          for cvs-include-outgoing; Tue, 27 Feb 1996 11:42:53 -0800 (PST)
Received: (from pst@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id LAA17238
          Tue, 27 Feb 1996 11:42:47 -0800 (PST)
Date: Tue, 27 Feb 1996 11:42:47 -0800 (PST)
From: Paul Traina <pst>
Message-Id: <199602271942.LAA17238@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-include
Subject: cvs commit:  src/include db.h mpool.h
Sender: owner-cvs-include@FreeBSD.ORG
Precedence: bulk

pst         96/02/27 11:42:46

  Modified:    include   db.h mpool.h
  Log:
  Fix conflicts and merge into mainline (this may get cvs admined out and redone properly by Peter later)
  
  Revision  Changes    Path
  1.3       +3 -3      src/include/db.h
  1.3       +37 -73    src/include/mpool.h