summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-12-31 09:02:27 -0700
committerBrian Paul <brianp@vmware.com>2009-12-31 09:02:27 -0700
commit25024d948298a9f3f3210a0b91486f79a3917b0f (patch)
tree5647623b9781193b7ed55c8d9233404938aeb853 /docs
parentd14beea534dcb2b3ae2ae1f7ee0ba5dcdef3dba3 (diff)
parent195e7657e2f15f7ad8b22042b86bcf33c5bba76b (diff)
Merge branch 'mesa_7_7_branch'
Conflicts: configs/darwin src/gallium/auxiliary/util/u_clear.h src/gallium/state_trackers/xorg/xorg_exa_tgsi.c src/mesa/drivers/dri/i965/brw_draw_upload.c
Diffstat (limited to 'docs')
-rw-r--r--docs/news.html6
-rw-r--r--docs/relnotes-7.6.1.html2
-rw-r--r--docs/relnotes-7.7.html2
3 files changed, 7 insertions, 3 deletions
diff --git a/docs/news.html b/docs/news.html
index 2abec2e635..0a0be715c1 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,11 +10,15 @@
<H1>News</H1>
-<h2>November XX, 2009</h2>
+<h2>December 21, 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>
+<p>
+Also, <a href="relnotes-7.7.html">Mesa 7.7</a> is released. This is a new
+development release.
+</p>
<h2>September 28, 2009</h2>
diff --git a/docs/relnotes-7.6.1.html b/docs/relnotes-7.6.1.html
index 19d54041b2..1d0ecd2ac0 100644
--- a/docs/relnotes-7.6.1.html
+++ b/docs/relnotes-7.6.1.html
@@ -8,7 +8,7 @@
<body bgcolor="#eeeeee">
-<H1>Mesa 7.6.1 Release Notes, (date tbd)</H1>
+<H1>Mesa 7.6.1 Release Notes, 21 December 2009</H1>
<p>
Mesa 7.6.1 is a bug-fix release fixing issues since version 7.6.
diff --git a/docs/relnotes-7.7.html b/docs/relnotes-7.7.html
index de980238e5..c1ed654613 100644
--- a/docs/relnotes-7.7.html
+++ b/docs/relnotes-7.7.html
@@ -8,7 +8,7 @@
<body bgcolor="#eeeeee">
-<H1>Mesa 7.7 Release Notes / date TBD</H1>
+<H1>Mesa 7.7 Release Notes / 21 December 2009</H1>
<p>
Mesa 7.7 is a new development release.