summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2009-12-07 17:16:10 -0800
committerIan Romanick <ian.d.romanick@intel.com>2009-12-07 17:16:10 -0800
commit8fc433fa0f8c5364454858f9be919387feda440c (patch)
treeec4fd82af464123acbef1f16212aa44e8f9fddd1 /docs
parentbb64c9bcdf9962c4f74d71f49307de1da4c3392b (diff)
parent9dbd47fc6b1cf9ddfb318f2e05df0886cd5fe0df (diff)
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts: progs/demos/projtex.c progs/xdemos/glxinfo.c src/mesa/main/version.h To fix the confilicts in projtex.c and glxinfo.c I just took the code from mesa_7_6_branch. The conflicts seem to have occured from cherry-picks from mesa_7_7_branch to mesa_7_6_branch followed by commmits just to mesa_7_6_branch.
Diffstat (limited to 'docs')
-rw-r--r--docs/relnotes-7.6.1.html2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/relnotes-7.6.1.html b/docs/relnotes-7.6.1.html
index d155cf5a67..752f9cac64 100644
--- a/docs/relnotes-7.6.1.html
+++ b/docs/relnotes-7.6.1.html
@@ -56,6 +56,8 @@ tbd
<li>Fixed clipping / provoking vertex bugs in i965 driver.
<li>Assorted build fixes for AIX.
<li>Endianness fixes for the DRI swrast driver (bug 22767).</li>
+<li>Point sprite fixes for i915/945 driver.
+<li>Fixed assorted memory leaks (usually on error paths)
</ul>
<h2>Changes</h2>