From owner-p4-projects  Fri Oct 11 16:52:30 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1BA1E37B404; Fri, 11 Oct 2002 16:52:28 -0700 (PDT)
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 A2BC137B401
	for <perforce@freebsd.org>; Fri, 11 Oct 2002 16:52:27 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5E51743E91
	for <perforce@freebsd.org>; Fri, 11 Oct 2002 16:52:27 -0700 (PDT)
	(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 g9BNq7Mt051549
	for <perforce@freebsd.org>; Fri, 11 Oct 2002 16:52:07 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.3/Submit) id g9BNq63i051546
	for perforce@freebsd.org; Fri, 11 Oct 2002 16:52:06 -0700 (PDT)
Date: Fri, 11 Oct 2002 16:52:06 -0700 (PDT)
Message-Id: <200210112352.g9BNq63i051546@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 19108 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=19108

Change 19108 by peter@peter_daintree on 2002/10/11 16:51:32

	missing bits of IFC @19106 - grrr.
	(p4 integ -b ia64 @19106; p4 resolve -at)

Affected files ...

.. //depot/projects/ia64/games/wargames/Makefile#3 integrate
.. //depot/projects/ia64/games/wargames/wargames.6#3 integrate
.. //depot/projects/ia64/games/wargames/wargames.c#2 integrate

Differences ...

==== //depot/projects/ia64/games/wargames/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/games/wargames/Makefile,v 1.12 2002/08/30 07:14:42 jmallett Exp $
+# $FreeBSD: src/games/wargames/Makefile,v 1.14 2002/10/09 01:46:37 jmallett Exp $
 
 PROG=	wargames
 LDADD=	-lcurses

==== //depot/projects/ia64/games/wargames/wargames.6#3 (text+ko) ====

@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $FreeBSD: src/games/wargames/wargames.6,v 1.5 2002/08/29 04:07:20 jmallett Exp $
+.\"     $FreeBSD: src/games/wargames/wargames.6,v 1.7 2002/10/09 01:46:37 jmallett Exp $
 .\"
 .Dd February 22, 1998
 .Dt WARGAMES 6

==== //depot/projects/ia64/games/wargames/wargames.c#2 (text+ko) ====

@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/games/wargames/wargames.c,v 1.1 2002/08/30 07:14:42 jmallett Exp $");
+__FBSDID("$FreeBSD: src/games/wargames/wargames.c,v 1.3 2002/10/09 01:46:37 jmallett Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>

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