diff options
| author | marha <marha@users.sourceforge.net> | 2015-03-05 23:40:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-03-05 23:42:09 +0100 |
| commit | c646056120fe14e4c4ccf81bac5d78d61225a8e8 (patch) | |
| tree | ba0af42750f0ab6dc4724342a7063835636222b5 /mesalib/docs/contents.html | |
| parent | 87e58a93f7248171e736656080069cb65ff56aae (diff) | |
| parent | 8574eba804031f6b19713f0b02952280730bf62e (diff) | |
| download | vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.tar.gz vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.tar.bz2 vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/queryobj.c
Diffstat (limited to 'mesalib/docs/contents.html')
| -rw-r--r-- | mesalib/docs/contents.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mesalib/docs/contents.html b/mesalib/docs/contents.html index 50c0d5913..6612cbefa 100644 --- a/mesalib/docs/contents.html +++ b/mesalib/docs/contents.html @@ -61,7 +61,6 @@ <li><a href="shading.html" target="_parent">Shading Language</a> <li><a href="egl.html" target="_parent">EGL</a> <li><a href="opengles.html" target="_parent">OpenGL ES</a> -<li><a href="openvg.html" target="_parent">OpenVG / Vega</a> <li><a href="envvars.html" target="_parent">Environment Variables</a> <li><a href="osmesa.html" target="_parent">Off-Screen Rendering</a> <li><a href="debugging.html" target="_parent">Debugging Tips</a> |