Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 26 Oct 2002 17:42:52 -0700 (PDT)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 20215 for review
Message-ID:  <200210270042.g9R0gqsX051648@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=20215

Change 20215 by peter@peter_daintree on 2002/10/26 17:42:06

	mismerge

Affected files ...

.. //depot/projects/ia64/lib/libdisk/write_ia64_disk.c#5 integrate

Differences ...

==== //depot/projects/ia64/lib/libdisk/write_ia64_disk.c#5 (text+ko) ====

@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/write_i386_disk.c,v 1.3 2002/10/23 21:05:42 phk Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_ia64_disk.c,v 1.4 2002/10/27 00:21:02 peter Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>

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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210270042.g9R0gqsX051648>