summaryrefslogtreecommitdiff
path: root/man/XSetDeviceButtonMapping.man
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:39:26 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:39:26 +0000
commitf1be04c808090763c1414b5f08b7b347498d2703 (patch)
treea0b1faf78d12cfff404eaab57e96aa84f1cc5841 /man/XSetDeviceButtonMapping.man
parente096ac42209e3f383cd4e52cb4e2dff564bdbc8e (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 'man/XSetDeviceButtonMapping.man')
-rw-r--r--man/XSetDeviceButtonMapping.man2
1 files changed, 1 insertions, 1 deletions
diff --git a/man/XSetDeviceButtonMapping.man b/man/XSetDeviceButtonMapping.man
index 8ed8a3e..6e63b53 100644
--- a/man/XSetDeviceButtonMapping.man
+++ b/man/XSetDeviceButtonMapping.man
@@ -1,5 +1,5 @@
.\"
-.\" $XFree86: xc/doc/man/Xi/XSeBMap.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XSeBMap.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
.\"
.\"
.\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer,