summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:39:22 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:39:22 +0000
commit5b6ea4938668fe060e591b2ef273183d0e3aea6f (patch)
tree727c4d24a77fb45b83d5f8e5d470dc81aa647d91 /man
parent7a7335496b33ed9b516fddf6a86e4034ea098aa2 (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/Xcursor.man2
1 files changed, 1 insertions, 1 deletions
diff --git a/man/Xcursor.man b/man/Xcursor.man
index a40369b..f3cfc13 100644
--- a/man/Xcursor.man
+++ b/man/Xcursor.man
@@ -1,6 +1,6 @@
.\"
.\" $XdotOrg: xc/lib/Xcursor/Xcursor.man,v 1.5 2003/11/23 05:40:36 dawes Exp $
-.\" $XFree86: xc/lib/Xcursor/Xcursor.man,v 1.5 2003/11/23 05:40:36 dawes Exp $
+.\" $XFree86: xc/lib/Xcursor/Xcursor.man,v 1.4 2003/06/12 14:12:27 eich Exp $
.\"
.\" Copyright 2002 Keith Packard, member of The XFree86 Project, Inc..\"
.\" Permission to use, copy, modify, distribute, and sell this software and its