From owner-p4-projects  Sun Dec  1 17:59: 5 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CE2CF37B404; Sun,  1 Dec 2002 17:59:03 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 67B9137B401
	for <perforce@freebsd.org>; Sun,  1 Dec 2002 17:59:03 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 24C3543EA9
	for <perforce@freebsd.org>; Sun,  1 Dec 2002 17:59:03 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gB21t0mV097422
	for <perforce@freebsd.org>; Sun, 1 Dec 2002 17:55:00 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gB21t0wp097415
	for perforce@freebsd.org; Sun, 1 Dec 2002 17:55:00 -0800 (PST)
Date: Sun, 1 Dec 2002 17:55:00 -0800 (PST)
Message-Id: <200212020155.gB21t0wp097415@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 21785 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=21785

Change 21785 by peter@peter_daintree on 2002/12/01 17:54:34

	mismerge

Affected files ...

.. //depot/projects/ia64/lib/libutil/logout.c#4 edit
.. //depot/projects/ia64/lib/libutil/logwtmp.c#5 edit

Differences ...

==== //depot/projects/ia64/lib/libutil/logout.c#4 (text+ko) ====

@@ -50,7 +50,6 @@
 #include <string.h>
 #include <timeconv.h>
 #include <libutil.h>
-#include <timeconv.h>
 
 typedef struct utmp UTMP;
 

==== //depot/projects/ia64/lib/libutil/logwtmp.c#5 (text+ko) ====

@@ -53,7 +53,6 @@
 #include <timeconv.h>
 #include <unistd.h>
 #include <utmp.h>
-#include <timeconv.h>
 
 /* wrapper for KAME-special getnameinfo() */
 #ifndef NI_WITHSCOPEID

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message