diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-19 09:07:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-19 09:07:37 +0200 |
| commit | 2d042f719910c5aa1ba9f4a47b21009c729c345e (patch) | |
| tree | 2b20d89d5f1ca342ca6f1d817c18b324adf7086f /mesalib/docs/sourcetree.html | |
| parent | c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d (diff) | |
| parent | 854ec4da20ddff9b830be0a7d5b81d8cb4774132 (diff) | |
| download | vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.gz vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.bz2 vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 libXdmcp libxcb xkeyboard-config mesa pixman xserver git update 19 aug 2013
Conflicts:
fontconfig/src/fccache.c
Diffstat (limited to 'mesalib/docs/sourcetree.html')
| -rw-r--r-- | mesalib/docs/sourcetree.html | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mesalib/docs/sourcetree.html b/mesalib/docs/sourcetree.html index 530c333c4..a6868d398 100644 --- a/mesalib/docs/sourcetree.html +++ b/mesalib/docs/sourcetree.html @@ -59,7 +59,6 @@ each directory. <li><b>osmesa</b> - off-screen software driver <li>XXX more </ul> - <li><b>es</b> - OpenGL ES overlay, parallelly buildable with the core Mesa <li><b>math</b> - vertex array translation and transformation code (not used with Gallium) <li><b>program</b> - Vertex/fragment shader and GLSL compiler code @@ -135,7 +134,6 @@ each directory. <li><b>clover</b> - OpenCL state tracker <li><b>dri</b> - Meta state tracker for DRI drivers <li><b>egl</b> - Meta state tracker for EGL drivers - <li><b>es</b> - OpenGL ES 1.x and 2.x state trackers <li><b>glx</b> - Meta state tracker for GLX <li><b>vdpau</b> - VDPAU state tracker <li><b>vega</b> - OpenVG 1.x state tracker |