From owner-svn-src-stable@FreeBSD.ORG  Sun May 31 18:14:25 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1D0E81065672;
	Sun, 31 May 2009 18:14:25 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0ADDF8FC0A;
	Sun, 31 May 2009 18:14:25 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VIEOlH051321;
	Sun, 31 May 2009 18:14:24 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4VIEOGV051320;
	Sun, 31 May 2009 18:14:24 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200905311814.n4VIEOGV051320@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 31 May 2009 18:14:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193182 - stable/7/share/misc
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 May 2009 18:14:25 -0000

Author: ed
Date: Sun May 31 18:14:24 2009
New Revision: 193182
URL: http://svn.freebsd.org/changeset/base/193182

Log:
  Correct the previous commit.
  
  Also merge the operator file in share/misc, that is also part of r190855.

Modified:
  stable/7/share/misc/   (props changed)
  stable/7/share/misc/iso639   (props changed)
  stable/7/share/misc/operator

Modified: stable/7/share/misc/operator
==============================================================================
--- stable/7/share/misc/operator	Sun May 31 18:06:46 2009	(r193181)
+++ stable/7/share/misc/operator	Sun May 31 18:14:24 2009	(r193182)
@@ -1,19 +1,21 @@
-Operator				Associativity
------------------------------------------------------
-() [] -> .				left to right
-! ~ ++ -- - (type) * & sizeof		right to left
-* / %					left to right
-+ -					left to right
-<< >>					left to right
-< <= > >=				left to right
-== !=					left to right
-&					left to right
-^					left to right
-|					left to right
-&&					left to right
-||					left to right
-?:					right to left
-= += -= *= /= %= <<= >>= &= ^= |=	right to left
-,					left to right
+Operator					Associativity
+-------------------------------------------------------------
+() [] -> .					left to right
+! ~ ++ -- - (type) * & sizeof new delete	right to left
+->* .*						left to right
+* / %						left to right
++ -						left to right
+<< >>						left to right
+< <= > >=					left to right
+== !=						left to right
+&						left to right
+^						left to right
+|						left to right
+&&						left to right
+||						left to right
+?:						right to left
+= += -= *= /= %= <<= >>= &= ^= |= throw		right to left
+?: (C++, third operand)				right to left
+,						left to right
 
 $FreeBSD$