diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-30 11:11:16 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-30 11:11:16 +0200 |
| commit | 0f0386d4e90cb0769eddc04b18742d5a9a72ea05 (patch) | |
| tree | a8a5fb11e78c4afe6637c5adfa0d2224208f7314 /libX11/specs/XKB/acknowledgement.xml | |
| parent | cd27f58626705bcb561115b8e5b0d1430df83fa6 (diff) | |
| parent | 762b7fde3d57d3a151f98535fd31516b7e823bc0 (diff) | |
| download | vcxsrv-0f0386d4e90cb0769eddc04b18742d5a9a72ea05.tar.gz vcxsrv-0f0386d4e90cb0769eddc04b18742d5a9a72ea05.tar.bz2 vcxsrv-0f0386d4e90cb0769eddc04b18742d5a9a72ea05.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
xorg-server/glx/glapi_gentable.c
Diffstat (limited to 'libX11/specs/XKB/acknowledgement.xml')
| -rw-r--r-- | libX11/specs/XKB/acknowledgement.xml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/libX11/specs/XKB/acknowledgement.xml b/libX11/specs/XKB/acknowledgement.xml index 2977999c4..4ecb798c1 100644 --- a/libX11/specs/XKB/acknowledgement.xml +++ b/libX11/specs/XKB/acknowledgement.xml @@ -24,12 +24,20 @@ not only for the quality of this document, but for the quality of the Keyboard extension itself. </para> <para> +<literallayout> Matt Landau -</para> -<para> Manager, X Window System +X Consortium Inc. +</literallayout> </para> +<simplesect> +<title>X Version 11, Release 7 addendum</title> <para> -X Consortium Inc. +This document is made available to you in modern formats such as HTML and PDF +thanks to the efforts of Matt Dew, who converted the original troff sources to +DocBook/XML and edited them into shape; Fernando Carrijo, who converted the +images to SVG format; and Gaetan Nadon, who set up the formatting machinery in +the libX11 builds and performed further editing of the DocBook markup. </para> +</simplesect> </preface> |