From owner-cvs-user  Sun Jul 28 01:20:13 1996
Return-Path: owner-cvs-user
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id BAA06451
          for cvs-user-outgoing; Sun, 28 Jul 1996 01:20:13 -0700 (PDT)
Received: from internat.freebsd.org (internat.freebsd.org [146.64.28.89])
          by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id BAA05600;
          Sun, 28 Jul 1996 01:13:56 -0700 (PDT)
Received: (from markm@localhost) by internat.freebsd.org (8.7.5/8.6.9) id KAA23252; Sun, 28 Jul 1996 10:13:53 +0200 (SAT)
Date: Sun, 28 Jul 1996 10:13:53 +0200 (SAT)
From: Mark Murray <markm@internat.freebsd.org>
Message-Id: <199607280813.KAA23252@internat.freebsd.org>
To: CVS-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-user@FreeBSD.ORG
Subject: cvs commit:  src/secure/lib/libdes des.h new_rkey.c version.h
Sender: owner-cvs-user@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

markm       96/07/28 10:13:53

FreeBSD International Crypto Repository

  Modified:    secure/lib/libdes  des.h new_rkey.c
  Removed:     secure/lib/libdes  version.h
  Log:
  Merge conflicts.
  
  Revision  Changes    Path
  1.3       +38 -9     src/secure/lib/libdes/des.h
  1.4       +4 -4      src/secure/lib/libdes/new_rkey.c