Date: Fri, 22 Aug 2008 21:04:07 GMT From: Marius Strobl <marius@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 148136 for review Message-ID: <200808222104.m7ML47sp057761@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=148136 Change 148136 by marius@flak on 2008/08/22 21:03:29 Fix a merge botch. Affected files ... .. //depot/projects/usiii/conf/files.sparc64#7 edit .. //depot/projects/usiii/conf/options.sparc64#4 edit Differences ... ==== //depot/projects/usiii/conf/files.sparc64#7 (text+ko) ==== ==== //depot/projects/usiii/conf/options.sparc64#4 (text+ko) ==== @@ -1,15 +1,5 @@ ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/conf/options.sparc64#14 -# $FreeBSD: src/sys/conf/options.sparc64,v 1.14 2006/11/02 00:01:15 marius Exp $ - -SUN4U opt_global.h - -==== THEIRS //depot/vendor/freebsd/src/sys/conf/options.sparc64#15 # $FreeBSD: src/sys/conf/options.sparc64,v 1.15 2008/08/22 20:28:19 marius Exp $ -==== YOURS //flak/projects/usiii/conf/options.sparc64 -# $FreeBSD: src/sys/conf/options.sparc64,v 1.14 2006/11/02 00:01:15 marius Exp $ - -<<<< GFB_DEBUG opt_gfb.h GFB_NO_FONT_LOADING opt_gfb.h GFB_NO_MODE_CHANGE opt_gfb.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808222104.m7ML47sp057761>