summaryrefslogtreecommitdiff
path: root/include/X11/extensions
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:39:27 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:39:27 +0000
commit354933180c848ef9381c89c3d079e18e6d73ca28 (patch)
tree27604e4eea1d8e0673643ff8bf4f704f5f3ac305 /include/X11/extensions
parent40732a273fc791a07ad7cbf26ce4f437a7f1baee (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 'include/X11/extensions')
-rw-r--r--include/X11/extensions/Xrandr.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/X11/extensions/Xrandr.h b/include/X11/extensions/Xrandr.h
index 7a0d6c5..e27115c 100644
--- a/include/X11/extensions/Xrandr.h
+++ b/include/X11/extensions/Xrandr.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/lib/Xrandr/Xrandr.h,v 1.11 2002/10/14 18:01:39 keithp Exp $
+ * $XFree86: xc/lib/Xrandr/Xrandr.h,v 1.9 2002/09/29 23:39:44 keithp Exp $
*
* Copyright © 2000 Compaq Computer Corporation, Inc.
* Copyright © 2002 Hewlett-Packard Company, Inc.