diff options
| author | Egbert Eich <eich@freedesktop.org> | 2004-03-01 13:44:08 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@freedesktop.org> | 2004-03-01 13:44:08 +0000 |
| commit | e1f006bc728ae8932c8fb5401f260fae022cb77c (patch) | |
| tree | fe91188647425cff9f3cdd516e393959d3155d01 | |
| parent | 1f42e6ce18e72eabf5fe02a3a693fca58267dfd3 (diff) | |
| download | xorg-lib-libX11-XEVIE.tar.gz | |
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).XEVIE
| -rw-r--r-- | include/X11/Xlib.h | 2 | ||||
| -rw-r--r-- | nls/locale.alias.pre | 2 | ||||
| -rw-r--r-- | nls/locale.dir.pre | 2 | ||||
| -rw-r--r-- | src/SetLocale.c | 2 | ||||
| -rw-r--r-- | src/xlibi18n/XlcDL.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h index e16413e9..9de15a1f 100644 --- a/include/X11/Xlib.h +++ b/include/X11/Xlib.h @@ -1,4 +1,4 @@ -/* $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 $ */ /* diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre index 2ed62ba5..ba4b60fb 100644 --- a/nls/locale.alias.pre +++ b/nls/locale.alias.pre @@ -1,4 +1,4 @@ -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. diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre index 30e0e9dd..075beb60 100644 --- a/nls/locale.dir.pre +++ b/nls/locale.dir.pre @@ -1,4 +1,4 @@ -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 diff --git a/src/SetLocale.c b/src/SetLocale.c index b54fc918..b0c3e71e 100644 --- a/src/SetLocale.c +++ b/src/SetLocale.c @@ -1,4 +1,4 @@ -/* $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 $ */ /* diff --git a/src/xlibi18n/XlcDL.c b/src/xlibi18n/XlcDL.c index e4e2d8c1..2830182c 100644 --- a/src/xlibi18n/XlcDL.c +++ b/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) |