summaryrefslogtreecommitdiff
path: root/setxkbmap.man
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:41:17 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:41:17 +0000
commit7d78f0b785611d6481b6a1967395ed7f43726178 (patch)
tree3d6256a1b3af25f0fa17f2458749c8ee1c3d688c /setxkbmap.man
parent77f887fff3dc6fcf948fb93a7bf9d77890fbd47d (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 'setxkbmap.man')
-rw-r--r--setxkbmap.man2
1 files changed, 1 insertions, 1 deletions
diff --git a/setxkbmap.man b/setxkbmap.man
index 44625ed..c21eca6 100644
--- a/setxkbmap.man
+++ b/setxkbmap.man
@@ -1,5 +1,5 @@
.\"
-.\" $XFree86: xc/programs/setxkbmap/setxkbmap.man,v 3.7 2003/05/29 22:16:23 herrb Exp $
+.\" $XFree86: xc/programs/setxkbmap/setxkbmap.man,v 3.6 2003/01/20 04:15:08 dawes Exp $
.\"
.TH SETXKBMAP 1 __xorgversion__
.SH NAME