summaryrefslogtreecommitdiff
path: root/xkbcomp.man
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:41:28 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:41:28 +0000
commit56cd2e432b29a8a4bf4ba2e5411c116c50b7d87a (patch)
treef257883a326c92113f0078f27f1d2a61a4bc3066 /xkbcomp.man
parent5be0ac3f15b0de8981560ada5939e11a62a9d326 (diff)
downloadxorg-app-xkbcomp-56cd2e432b29a8a4bf4ba2e5411c116c50b7d87a.tar.gz
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 'xkbcomp.man')
-rw-r--r--xkbcomp.man2
1 files changed, 1 insertions, 1 deletions
diff --git a/xkbcomp.man b/xkbcomp.man
index 55beef7..aa18d3e 100644
--- a/xkbcomp.man
+++ b/xkbcomp.man
@@ -3,7 +3,7 @@
.\"
.\"
.\"
-.\" $XFree86: xc/programs/xkbcomp/xkbcomp.man,v 1.12 2004/01/12 21:43:20 herrb Exp $
+.\" $XFree86: xc/programs/xkbcomp/xkbcomp.man,v 1.11 2003/07/28 21:57:02 herrb Exp $
.\"
.TH XKBCOMP 1 __xorgversion__
.SH NAME