summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:40:35 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:40:35 +0000
commitad179e6b335b0af02b3a8195a10a7e0c8d9df713 (patch)
tree5cfea24d9eeb45447cd68cf27515f7497d120ceb /man
parent5b29e9b7568dd14d10c6b86b5294c3bc86424bf8 (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')
-rw-r--r--man/sis.man2
1 files changed, 1 insertions, 1 deletions
diff --git a/man/sis.man b/man/sis.man
index ec4aee8..ae13b1d 100644
--- a/man/sis.man
+++ b/man/sis.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis.man,v 1.14 2003/11/12 16:50:36 twini Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis.man,v 1.5 2001/12/17 20:52:34 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SIS __drivermansuffix__ __vendorversion__