summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2009-06-11 16:34:56 +0100
committerJosé Fonseca <jfonseca@vmware.com>2009-06-11 16:34:56 +0100
commitbf89ecb6c92aaaeccd7b6f093cb8bae9fd56aaf6 (patch)
treeb7b38a1e1bd5e975f77ec23ea872a97dc6963b64 /docs
parent0d2ac7a10b2904eda70794534a9a73b3f4b654cf (diff)
parentcc09724a50a4cabb68b7c5f5b8d3812d38f65391 (diff)
Merge branch 'mesa_7_5_branch'
Conflicts: src/mesa/state_tracker/st_cb_fbo.c src/mesa/state_tracker/st_framebuffer.c
Diffstat (limited to 'docs')
-rw-r--r--docs/relnotes-7.5.html1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html
index d47b21d827..663626cb05 100644
--- a/docs/relnotes-7.5.html
+++ b/docs/relnotes-7.5.html
@@ -74,6 +74,7 @@ including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0
<h2>Bug fixes</h2>
<ul>
<li>Lots of i965 driver bug fixes
+<li>Fixed some GLSL preprocessor bugs
</ul>