From f1be04c808090763c1414b5f08b7b347498d2703 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:39:26 +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/XGrDvKey.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/XGrDvKey.c') diff --git a/src/XGrDvKey.c b/src/XGrDvKey.c index 437684c..94e9ba4 100644 --- a/src/XGrDvKey.c +++ b/src/XGrDvKey.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGrDvKey.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGrDvKey.c,v 3.3 2001/12/14 19:55:17 dawes Exp $ */ /*********************************************************************** * -- cgit v1.2.3