From owner-p4-projects@FreeBSD.ORG  Sun Apr  4 14:56:43 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BC43116A4D0; Sun,  4 Apr 2004 14:56:42 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 95A3016A4CE
	for <perforce@freebsd.org>; Sun,  4 Apr 2004 14:56:42 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7713043D53
	for <perforce@freebsd.org>; Sun,  4 Apr 2004 14:56:42 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i34LugGe041543
	for <perforce@freebsd.org>; Sun, 4 Apr 2004 14:56:42 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i34LugMC041540
	for perforce@freebsd.org; Sun, 4 Apr 2004 14:56:42 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 4 Apr 2004 14:56:42 -0700 (PDT)
Message-Id: <200404042156.i34LugMC041540@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 50359 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sun, 04 Apr 2004 21:56:43 -0000

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

Change 50359 by rwatson@rwatson_paprika on 2004/04/04 14:55:58

	Odd local change was actually a change in the parent branch
	and I was using diff2 without a tag.  Sigh.

Affected files ...

.. //depot/projects/netperf_socket/sys/netgraph/ng_l2tp.c#3 integrate

Differences ...

==== //depot/projects/netperf_socket/sys/netgraph/ng_l2tp.c#3 (text+ko) ====