From owner-cvs-all@FreeBSD.ORG  Tue Jun 15 21:57:08 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id C711216A4CF; Tue, 15 Jun 2004 21:57:08 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id AA2F443D55; Tue, 15 Jun 2004 21:57:08 +0000 (GMT)
	(envelope-from dds@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5FLtkKm088351;
	Tue, 15 Jun 2004 21:55:46 GMT
	(envelope-from dds@repoman.freebsd.org)
Received: (from dds@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5FLtk4O088350;
	Tue, 15 Jun 2004 21:55:46 GMT
	(envelope-from dds)
Message-Id: <200406152155.i5FLtk4O088350@repoman.freebsd.org>
From: Diomidis Spinellis <dds@FreeBSD.org>
Date: Tue, 15 Jun 2004 21:55:45 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_4
Subject: cvs commit: src/lib/libradius radlib.h
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Jun 2004 21:57:08 -0000

dds         2004-06-15 21:55:45 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_4)
    lib/libradius        radlib.h 
  Log:
  Removed CVS conflict lines.
  
  Noticed by: pjd
  
  Revision  Changes    Path
  1.3.2.4   +0 -4      src/lib/libradius/radlib.h