diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-25 08:32:21 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-25 08:32:21 +0100 |
| commit | 849d328b25c2f3c87d539e1fe7af38e7580a0409 (patch) | |
| tree | 349c425a87ddb3aaa1d7832d5a8e68252fc73ddb /xorg-server/hw/xfree86/doc/ddxDesign.xml | |
| parent | a8a12d4c8be177f63cae7dc96c2b52f09e228a76 (diff) | |
| parent | a0b4a1330be6a36ad095222d2ea83927cd33514d (diff) | |
| download | vcxsrv-849d328b25c2f3c87d539e1fe7af38e7580a0409.tar.gz vcxsrv-849d328b25c2f3c87d539e1fe7af38e7580a0409.tar.bz2 vcxsrv-849d328b25c2f3c87d539e1fe7af38e7580a0409.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/glxdriswrast.c
xorg-server/glx/single2.c
xorg-server/hw/xwin/winconfig.c
xorg-server/os/osinit.c
xorg-server/os/xdmcp.c
xorg-server/xkb/xkbInit.c
Diffstat (limited to 'xorg-server/hw/xfree86/doc/ddxDesign.xml')
| -rw-r--r-- | xorg-server/hw/xfree86/doc/ddxDesign.xml | 4 |
1 files changed, 2 insertions, 2 deletions
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 |