From owner-cvs-all@FreeBSD.ORG  Fri Jul  2 09:29:10 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 1E04716A4CE; Fri,  2 Jul 2004 09:29:10 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id F304443D4C; Fri,  2 Jul 2004 09:29:09 +0000 (GMT)
	(envelope-from tjr@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 i629R9B7019474;
	Fri, 2 Jul 2004 09:27:09 GMT
	(envelope-from tjr@repoman.freebsd.org)
Received: (from tjr@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i629R9r3019473;
	Fri, 2 Jul 2004 09:27:09 GMT
	(envelope-from tjr)
Message-Id: <200407020927.i629R9r3019473@repoman.freebsd.org>
From: "Tim J. Robbins" <tjr@FreeBSD.org>
Date: Fri, 2 Jul 2004 09:27:09 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/contrib/gnu-sort/lib
	hard-locale.csrc/contrib/gnu-sort/src sys2.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: Fri, 02 Jul 2004 09:29:10 -0000

tjr         2004-07-02 09:27:09 UTC

  FreeBSD src repository

  Modified files:
    contrib/gnu-sort/lib hard-locale.c 
  Removed files:
    contrib/gnu-sort/src sys2.h 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.4       +5 -10     src/contrib/gnu-sort/lib/hard-locale.c
  1.2       +0 -565    src/contrib/gnu-sort/src/sys2.h (dead)