summaryrefslogtreecommitdiff
path: root/man/XRes.man
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:39:19 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:39:19 +0000
commit50fd91205709092a640e3b35b3062ffb279941f1 (patch)
treec481a7d333eca5e4b2a86a6e4b6019be3b2a1198 /man/XRes.man
parent1f27e1259a6dd2237b3dfe752ac138d83c5e5409 (diff)
downloadxorg-lib-libXRes-50fd91205709092a640e3b35b3062ffb279941f1.tar.gz
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/XRes.man')
-rw-r--r--man/XRes.man2
1 files changed, 1 insertions, 1 deletions
diff --git a/man/XRes.man b/man/XRes.man
index 1cc61d7..179e308 100644
--- a/man/XRes.man
+++ b/man/XRes.man
@@ -1,6 +1,6 @@
.\"
.\" $XdotOrg: xc/lib/XRes/XRes.man,v 1.3 2003/12/04 19:10:30 dawes Exp $
-.\" $XFree86: xc/lib/XRes/XRes.man,v 1.3 2003/12/04 19:10:30 dawes Exp $
+.\" $XFree86: xc/lib/XRes/XRes.man,v 1.2 2003/10/13 21:22:54 herrb Exp $
.\"
.\" Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
.\"