Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Aug 2004 22:45:05 GMT
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 60729 for review
Message-ID:  <200408302245.i7UMj5gr031357@repoman.freebsd.org>

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

Change 60729 by peter@peter_daintree on 2004/08/30 22:44:21

	fix mismerge

Affected files ...

.. //depot/projects/hammer/sys/amd64/conf/NOTES#45 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/conf/NOTES#45 (text+ko) ====

@@ -5,7 +5,7 @@
 # machine independent notes, look in /sys/conf/NOTES.
 #
 # (XXX from i386:NOTES,v 1.1170)
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.18 2004/08/16 12:39:27 tjr Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.19 2004/08/27 21:29:20 arved Exp $
 #
 
 #



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