summaryrefslogtreecommitdiff
path: root/src/TMkey.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:39:30 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:39:30 +0000
commite1776973e1fbb3d6a0b043a3b34ff56c61416a7f (patch)
treec501bcce6e36b6d99cc6e190e446c076efe85f02 /src/TMkey.c
parent2928a163b235d91385874aa6a1a6f893b045f606 (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
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).
Diffstat (limited to 'src/TMkey.c')
-rw-r--r--src/TMkey.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/TMkey.c b/src/TMkey.c
index e338954..56227b6 100644
--- a/src/TMkey.c
+++ b/src/TMkey.c
@@ -59,7 +59,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/TMkey.c,v 3.11 2003/04/21 16:34:28 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/TMkey.c,v 3.10 2001/12/14 19:56:30 dawes Exp $ */
#define XK_MISCELLANY
#define XK_LATIN1