3. Added missing parts to XKB to make XEVIE branch compile (Egbert Eich). 2....

3. Added missing parts to XKB to make XEVIE branch compile (Egbert Eich). 2. Merged with XORG-CURRENT branch to obtain a bugfix (Egbert Eich). 1. First add of SUN's XIVIE extension (Stuart Kreitman).

include/X11/Xlib.h

-/* $XdotOrg: lib/X11/include/X11/Xlib.h,v 1.1.4.7 2004-02-24 20:26:32 kaleb Exp $ */
+/* $XdotOrg: lib/X11/include/X11/Xlib.h,v 1.1.4.6.2.1 2004-03-01 13:44:13 eich Exp $ */
 /* $Xorg: Xlib.h,v 1.6 2001/02/09 02:03:38 xorgcvs Exp $ */
 /* 
 

nls/locale.alias.pre

-XCOMM	$XdotOrg: lib/X11/nls/locale.alias.pre,v 1.1.4.6 2004-02-23 21:34:50 kaleb Exp $
+XCOMM	$XdotOrg: lib/X11/nls/locale.alias.pre,v 1.1.4.3.2.1 2004-03-01 13:44:17 eich Exp $
 XCOMM	$Xorg: locale.alias,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
 XCOMM
 XCOMM	This file contains alias name of locale.

nls/locale.dir.pre

-XCOMM	$XdotOrg: lib/X11/nls/locale.dir.pre,v 1.1.4.5 2004-02-23 21:34:50 kaleb Exp $
+XCOMM	$XdotOrg: lib/X11/nls/locale.dir.pre,v 1.1.4.3.2.1 2004-03-01 13:44:17 eich Exp $
 XCOMM	$Xorg: locale.dir,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
 XCOMM
 XCOMM	This file contains locale database file names

src/SetLocale.c

-/* $XdotOrg: lib/X11/src/SetLocale.c,v 1.1.4.4 2004-02-23 21:34:20 kaleb Exp $ */
+/* $XdotOrg: lib/X11/src/SetLocale.c,v 1.1.4.3.2.1 2004-03-01 13:44:13 eich Exp $ */
 /* $Xorg: SetLocale.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
 
 /*

src/xlibi18n/XlcDL.c

@@ -42,7 +42,7 @@ Sun Microsystems, Inc. or its licensors is granted.
 
 */
 /* $XFree86: xc/lib/X11/XlcDL.c,v 1.13 2003/11/17 22:20:10 dawes Exp $ */
-/* $XdotOrg: lib/X11/src/xlibi18n/XlcDL.c,v 1.1.4.3 2004-02-11 17:46:29 eich Exp $ */
+/* $XdotOrg: lib/X11/src/xlibi18n/XlcDL.c,v 1.1.4.2.4.1 2004-03-01 13:44:13 eich Exp $ */
 
 #include <stdio.h>
 #if defined(hpux)