summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:39:28 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:39:28 +0000
commit5ded9518470018c739dae3a3b24846ead0c35206 (patch)
treee0df3f2b8e5a0d90e2ea906acde1b3928e98a726 /include
parent35a608915a0512ca419fb0d4f3116fd68d2d8bc5 (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/extensions/Xrender.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/X11/extensions/Xrender.h b/include/X11/extensions/Xrender.h
index 68f6b0a..1c05cea 100644
--- a/include/X11/extensions/Xrender.h
+++ b/include/X11/extensions/Xrender.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/lib/Xrender/Xrender.h,v 1.18 2002/11/23 02:34:45 keithp Exp $
+ * $XFree86: xc/lib/Xrender/Xrender.h,v 1.17 2002/11/06 22:47:49 keithp Exp $
*
* Copyright © 2000 SuSE, Inc.
*