summaryrefslogtreecommitdiff
path: root/man/XF86VM.man
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:40:09 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:40:09 +0000
commit4d5f6ba59216073a5864d459348ca51d0bd4d1e5 (patch)
tree73eba338c20cf3250b0536fd76cc43fa119db6a7 /man/XF86VM.man
parent295d1bc87aada03e714be451b8899b32819d5278 (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASE
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/XF86VM.man')
-rw-r--r--man/XF86VM.man2
1 files changed, 1 insertions, 1 deletions
diff --git a/man/XF86VM.man b/man/XF86VM.man
index b24eb98..7e2a689 100644
--- a/man/XF86VM.man
+++ b/man/XF86VM.man
@@ -5,7 +5,7 @@
.\"
.\"
.\" Copyright (c) 1996 Joe Moss, The XFree86 Project
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/doc/man/XF86VM.man,v 3.15 2003/11/23 05:40:36 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/doc/man/XF86VM.man,v 3.14 2003/10/02 13:29:56 eich Exp $
.\"
.de ZN
.ie t \fB\^\\$1\^\fR\\$2