summaryrefslogtreecommitdiff
path: root/include
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 /include
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 'include')
-rw-r--r--include/X11/Xcursor/Xcursor.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/X11/Xcursor/Xcursor.h b/include/X11/Xcursor/Xcursor.h
index 3176020..c4b4ac2 100644
--- a/include/X11/Xcursor/Xcursor.h
+++ b/include/X11/Xcursor/Xcursor.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/lib/Xcursor/Xcursor.h,v 1.4 2003/01/26 03:22:42 eich Exp $
+ * $XFree86: xc/lib/Xcursor/Xcursor.h,v 1.3 2002/11/23 02:34:45 keithp Exp $
*
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*