From owner-cvs-src-old@FreeBSD.ORG  Sun Jan 11 10:50:30 2009
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2CC791065764
	for <cvs-src-old@freebsd.org>; Sun, 11 Jan 2009 10:50:30 +0000 (UTC)
	(envelope-from maxim@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F42178FC1E
	for <cvs-src-old@freebsd.org>; Sun, 11 Jan 2009 10:50:29 +0000 (UTC)
	(envelope-from maxim@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0BAoTO6056424
	for <cvs-src-old@freebsd.org>; Sun, 11 Jan 2009 10:50:29 GMT
	(envelope-from maxim@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0BAoTcL056423
	for cvs-src-old@freebsd.org; Sun, 11 Jan 2009 10:50:29 GMT
	(envelope-from maxim@repoman.freebsd.org)
Message-Id: <200901111050.n0BAoTcL056423@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	maxim@repoman.freebsd.org using -f
From: Maxim Konovalov <maxim@FreeBSD.org>
Date: Sun, 11 Jan 2009 10:50:13 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_7
Subject: cvs commit: src/sbin/ipfw ipfw2.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jan 2009 10:50:30 -0000

maxim       2009-01-11 10:50:13 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    sbin/ipfw            ipfw2.c 
  Log:
  SVN rev 187048 on 2009-01-11 10:50:13Z by maxim
  
  Manually merge r183889:183890: do nothing in show_nat() for a test mode (-n).
  
  Revision    Changes    Path
  1.108.2.12  +3 -0      src/sbin/ipfw/ipfw2.c