From 56cd2e432b29a8a4bf4ba2e5411c116c50b7d87a Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:41:28 +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). --- xkbcomp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xkbcomp.h') diff --git a/xkbcomp.h b/xkbcomp.h index 0584846..b9b9cae 100644 --- a/xkbcomp.h +++ b/xkbcomp.h @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/xkbcomp.h,v 3.9 2002/06/05 00:00:38 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/xkbcomp.h,v 3.8 2001/12/19 21:30:30 dawes Exp $ */ #ifndef XKBCOMP_H #define XKBCOMP_H 1 -- cgit v1.2.3