summaryrefslogtreecommitdiff
path: root/xmodmap.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:41:37 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:41:37 +0000
commitfb62b8a736dd3c97203f9a5da9546193f39af3c7 (patch)
tree7a325c66e5e0f3230a32a1645e19c8167b4020e8 /xmodmap.c
parent158c5489e7371855683fd2f19f722316882627a7 (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-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 'xmodmap.c')
-rw-r--r--xmodmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xmodmap.c b/xmodmap.c
index 6cdb7f1..a67493f 100644
--- a/xmodmap.c
+++ b/xmodmap.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/xmodmap/xmodmap.c,v 1.9 2003/05/27 22:27:08 tsi Exp $ */
+/* $XFree86: xc/programs/xmodmap/xmodmap.c,v 1.8tsi Exp $ */
#include <X11/Xos.h>
#include <X11/Xlib.h>