From 46293a1716e968962a505ca1c0450556b6b38623 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:39:44 +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). --- include/X11/extensions/XKBfile.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/X11/extensions/XKBfile.h') diff --git a/include/X11/extensions/XKBfile.h b/include/X11/extensions/XKBfile.h index b894da0..bbd7e6f 100644 --- a/include/X11/extensions/XKBfile.h +++ b/include/X11/extensions/XKBfile.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/xkbfile/XKBfile.h,v 3.7 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/XKBfile.h,v 3.6 2003/10/24 16:33:09 tsi Exp $ */ #ifndef _XKBFILE_H_ #define _XKBFILE_H_ 1 -- cgit v1.2.3