summaryrefslogtreecommitdiff
path: root/xdpyinfo.man
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:41:21 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:41:21 +0000
commit931924ab82aa50727baa5388e517d30f68894bcb (patch)
treef69508275cf532d568712aaf92913cd8abe6ce5f /xdpyinfo.man
parent0f493b8518a8a56b84e5412751841838f3e9f107 (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 'xdpyinfo.man')
-rw-r--r--xdpyinfo.man2
1 files changed, 1 insertions, 1 deletions
diff --git a/xdpyinfo.man b/xdpyinfo.man
index 07a6e72..ca4326c 100644
--- a/xdpyinfo.man
+++ b/xdpyinfo.man
@@ -23,7 +23,7 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/xdpyinfo/xdpyinfo.man,v 3.8 2001/12/14 20:01:30 dawes Exp $
+.\" $XFree86: xc/programs/xdpyinfo/xdpyinfo.man,v 3.7 2001/01/27 18:21:11 dawes Exp $
.\"
.TH XDPYINFO 1 __xorgversion__
.SH NAME