summaryrefslogtreecommitdiff
path: root/docs/news.html
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2009-11-30 17:47:07 -0800
committerIan Romanick <ian.d.romanick@intel.com>2009-11-30 17:47:07 -0800
commit650e02003fbb5511ec758d993b7ec0a302ee2235 (patch)
tree96ff849518962856e51b2e3a26b78ba008b2f9ad /docs/news.html
parent270d36da146b899d39e08f830fe34b63833a3731 (diff)
parent587a52e95bbe96788e8b96b63f091bb3022fc048 (diff)
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts: progs/util/shaderutil.c src/mesa/drivers/dri/r600/r600_context.c src/mesa/main/version.h
Diffstat (limited to 'docs/news.html')
-rw-r--r--docs/news.html7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/news.html b/docs/news.html
index 93da56a5c3..2abec2e635 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,6 +10,13 @@
<H1>News</H1>
+<h2>November XX, 2009</h2>
+<p>
+<a href="relnotes-7.6.1.html">Mesa 7.6.1</a> is released. This is a bug-fix
+release fixing issues found in the 7.6 release.
+</p>
+
+
<h2>September 28, 2009</h2>
<p>
<a href="relnotes-7.6.html">Mesa 7.6</a> is released. This is a new feature