Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Apr 2003 18:18:27 -0700 (PDT)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 30217 for review
Message-ID:  <200305010118.h411IROG061891@repoman.freebsd.org>

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

Change 30217 by peter@peter_daintree on 2003/04/30 18:18:07

	fix mismerge

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/sigtramp.s#5 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/sigtramp.s#5 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2003, Peter Wemm <peter@freeBSD.org>
+ * Copyright (c) 2003 Peter Wemm <peter@freeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/amd64/sigtramp.s,v 1.1 2003/05/01 01:05:21 peter Exp $
  */
 
 #include <sys/syscall.h>



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