From owner-cvs-lib  Tue May 27 21:59:27 1997
Return-Path: <owner-cvs-lib>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id VAA23925
          for cvs-lib-outgoing; Tue, 27 May 1997 21:59:27 -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 VAA23841;
          Tue, 27 May 1997 21:57:51 -0700 (PDT)
From: Bill Paul <wpaul@FreeBSD.ORG>
Received: (from wpaul@localhost)
	by freefall.freebsd.org (8.8.5/8.8.5) id VAA11187;
	Tue, 27 May 1997 21:57:41 -0700 (PDT)
Date: Tue, 27 May 1997 21:57:41 -0700 (PDT)
Message-Id: <199705280457.VAA11187@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-lib@FreeBSD.ORG
Subject: cvs commit: src/lib/libc/xdr Makefile.inc xdr.3 xdr.c xdr_array.c
         xdr_float.c xdr_mem.c xdr_rec.c xdr_reference.c xdr_stdio.c
Sender: owner-cvs-lib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

wpaul       1997/05/27 21:57:41 PDT

  Modified files:
    lib/libc/xdr         Makefile.inc xdr.3 xdr.c xdr_array.c 
                         xdr_float.c xdr_mem.c xdr_rec.c 
                         xdr_reference.c xdr_stdio.c 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.7       +2 -3      src/lib/libc/xdr/Makefile.inc
  1.6       +1 -1      src/lib/libc/xdr/xdr.3
  1.7       +1 -1      src/lib/libc/xdr/xdr.c
  1.7       +1 -1      src/lib/libc/xdr/xdr_array.c
  1.6       +1 -1      src/lib/libc/xdr/xdr_float.c
  1.7       +1 -1      src/lib/libc/xdr/xdr_mem.c
  1.8       +1 -1      src/lib/libc/xdr/xdr_rec.c
  1.7       +1 -1      src/lib/libc/xdr/xdr_reference.c
  1.6       +1 -1      src/lib/libc/xdr/xdr_stdio.c