From owner-cvs-src@FreeBSD.ORG  Tue Apr  4 20:31:29 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 416D416A430;
	Tue,  4 Apr 2006 20:31:27 +0000 (UTC) (envelope-from gad@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D198743D48;
	Tue,  4 Apr 2006 20:31:26 +0000 (GMT) (envelope-from gad@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k34KVQZs092626;
	Tue, 4 Apr 2006 20:31:26 GMT (envelope-from gad@repoman.freebsd.org)
Received: (from gad@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k34KVQXE092625;
	Tue, 4 Apr 2006 20:31:26 GMT (envelope-from gad)
Message-Id: <200604042031.k34KVQXE092625@repoman.freebsd.org>
From: Garance A Drosehn <gad@FreeBSD.org>
Date: Tue, 4 Apr 2006 20:31:26 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/bin/ps keyword.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Apr 2006 20:31:29 -0000

gad         2006-04-04 20:31:26 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    bin/ps               keyword.c 
  Log:
  MFC 1.73->1.74:  Fix the case where the user specifies an alternate
  heading for some output-format keyword, and the keyword they picked
  is an alias to some other keyword.
  
  PR:             bin/57833
  Approved by:    re (scottl)
  
  Revision  Changes    Path
  1.72.2.1  +11 -6     src/bin/ps/keyword.c