From a0b4a1330be6a36ad095222d2ea83927cd33514d Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 25 Nov 2011 08:22:48 +0100
Subject: mesa xserver pixman git update 25 nov 2011

---
 xorg-server/hw/xfree86/doc/ddxDesign.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'xorg-server/hw/xfree86/doc')

diff --git a/xorg-server/hw/xfree86/doc/ddxDesign.xml b/xorg-server/hw/xfree86/doc/ddxDesign.xml
index c406cd744..ca5efc9be 100644
--- a/xorg-server/hw/xfree86/doc/ddxDesign.xml
+++ b/xorg-server/hw/xfree86/doc/ddxDesign.xml
@@ -34,7 +34,7 @@
 
     <pubdate>&xserver.reldate;</pubdate>
     <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
-    <releaseinfo>Xorg server version &xserver.version;</releaseinfo>
+    <releaseinfo>X Server Version &xserver.version;</releaseinfo>
 
   </articleinfo>
 
@@ -3187,7 +3187,7 @@ would not need to use these directly.
 
     <blockquote><para>
 	<programlisting>
-    char *xf86FindOptionValue(XF86OptionPtr options, const char *name);
+    const char *xf86FindOptionValue(XF86OptionPtr options, const char *name);
 	</programlisting>
 	<blockquote><para>
       Takes a list of options and an option name, and returns the value
-- 
cgit v1.2.3