From owner-p4-projects@FreeBSD.ORG  Tue Aug 28 21:04:31 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0F96116A51E; Tue, 28 Aug 2007 21:04:31 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C3CE016A4FC
	for <perforce@freebsd.org>; Tue, 28 Aug 2007 21:04:30 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 85B9F13C465
	for <perforce@freebsd.org>; Tue, 28 Aug 2007 21:04:30 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7SL4Up4040212
	for <perforce@freebsd.org>; Tue, 28 Aug 2007 21:04:30 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7SL4Ubs040202
	for perforce@freebsd.org; Tue, 28 Aug 2007 21:04:30 GMT
	(envelope-from marcel@freebsd.org)
Date: Tue, 28 Aug 2007 21:04:30 GMT
Message-Id: <200708282104.l7SL4Ubs040202@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 125797 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2007 21:04:31 -0000

http://perforce.freebsd.org/chv.cgi?CH=125797

Change 125797 by marcel@marcel_xcllnt on 2007/08/28 21:04:10

	Merge fodder.

Affected files ...

.. //depot/projects/e500/contrib/pf/pflogd/pidfile.c#3 edit
.. //depot/projects/e500/contrib/pf/pflogd/pidfile.h#3 edit

Differences ...

==== //depot/projects/e500/contrib/pf/pflogd/pidfile.c#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/contrib/pf/pflogd/pidfile.c,v 1.4 2005/05/03 16:55:20 mlaier Exp $ */
+/*	$FreeBSD: src/contrib/pf/pflogd/pidfile.c,v 1.6 2007/07/03 14:08:49 mlaier Exp $ */
 /*	$OpenBSD: pidfile.c,v 1.5 2002/05/26 09:29:02 deraadt Exp $	*/
 /*	$NetBSD: pidfile.c,v 1.4 2001/02/19 22:43:42 cgd Exp $	*/
 

==== //depot/projects/e500/contrib/pf/pflogd/pidfile.h#3 (text+ko) ====

@@ -1,1 +1,3 @@
+/* $FreeBSD: src/contrib/pf/pflogd/pidfile.h,v 1.3 2007/07/03 14:08:49 mlaier Exp $ */
+
 int pidfile(const char *);