Date: Wed, 30 Jun 2010 07:43:49 +0000 (UTC) From: "David E. O'Brien" <obrien@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r209606 - stable/7/lib/libpmc Message-ID: <201006300743.o5U7hnUF078224@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: obrien Date: Wed Jun 30 07:43:49 2010 New Revision: 209606 URL: http://svn.freebsd.org/changeset/base/209606 Log: Cleanup svn merge conflict markers. Modified: stable/7/lib/libpmc/pmc.tsc.3 Modified: stable/7/lib/libpmc/pmc.tsc.3 ============================================================================== --- stable/7/lib/libpmc/pmc.tsc.3 Wed Jun 30 04:52:42 2010 (r209605) +++ stable/7/lib/libpmc/pmc.tsc.3 Wed Jun 30 07:43:49 2010 (r209606) @@ -59,13 +59,10 @@ The alias maps to the TSC. .Sh SEE ALSO .Xr pmc 3 , -<<<<<<< current:lib/libpmc/pmc.tsc.3 .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -======= ->>>>>>> patched:lib/libpmc/pmc.tsc.3 .Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.p4 3 ,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006300743.o5U7hnUF078224>