From e8a005881cad65292bd73a2ed8f7454ce9d461f0 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:41:17 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid future conflicts on ASCII but not humal readable files. (There should probably be separate CreditsXorg.rtf files) (Egbert Eich). --- src/gram.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gram.y') diff --git a/src/gram.y b/src/gram.y index e8a0759..372b3b5 100644 --- a/src/gram.y +++ b/src/gram.y @@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group. * 11-Nov-90 Dave Sternlicht Adding SaveColors * 10-Oct-90 David M. Sternlicht Storing saved colors on root * - * $XFree86: xc/programs/twm/gram.y,v 3.9 2002/10/21 13:33:05 alanh Exp $ + * $XFree86: xc/programs/twm/gram.y,v 3.8 2002/10/16 21:33:03 tsi Exp $ * ***********************************************************************/ -- cgit v1.2.3