summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:44:11 +0000
committerEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:44:11 +0000
commitcaf01e28db4384fa554c58815a2d92c8b03e4a03 (patch)
tree6ae896d3c10713db97f2084fbf13777e763dabde
parentfb62b8a736dd3c97203f9a5da9546193f39af3c7 (diff)
Merge the new release from HEADXACE-SELINUX
-rw-r--r--exec.c2
-rw-r--r--xmodmap.man2
2 files changed, 2 insertions, 2 deletions
diff --git a/exec.c b/exec.c
index 4c77e35..796c260 100644
--- a/exec.c
+++ b/exec.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: exec.c,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ */
+/* $XdotOrg: xc/programs/xmodmap/exec.c,v 1.2 2004/04/23 19:54:59 eich Exp $ */
/* $Xorg: exec.c,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ */
/*
diff --git a/xmodmap.man b/xmodmap.man
index 34a19e3..17425e8 100644
--- a/xmodmap.man
+++ b/xmodmap.man
@@ -140,7 +140,7 @@ The \fIKEYSYMNAME\fP on the left hand side is translated into matching keycodes
used to perform the corresponding set of \fBkeycode\fP expressions.
The list of keysym names may be
found in the header file \fI<X11/keysymdef.h>\fP (without the \fIXK_\fP prefix)
-or the keysym database \fI__projectroot__/lib/X11/XKeysymDB\fP. Note that
+or the keysym database\fI __projectroot__/lib/X11/XKeysymDB\fP. Note that
if the same keysym is bound to multiple keys, the expression is executed
for each matching keycode.
.TP 8