diff options
| author | Brian Paul <brianp@vmware.com> | 2009-12-27 15:31:08 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-12-27 15:31:08 -0700 |
| commit | d0b7ff551ab25153e3023871af3daa65b394a828 (patch) | |
| tree | cfff232421273b15820b4ab6773219ba676e52d5 /docs | |
| parent | 7831515e69ac875b1ac0b1b248ab10c6cf37bf52 (diff) | |
| parent | da876fa3a5df77763fe106b5e0a17b2e672a506c (diff) | |
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
src/gallium/auxiliary/util/u_network.c
src/gallium/auxiliary/util/u_network.h
src/gallium/drivers/i915/i915_state.c
src/gallium/drivers/trace/tr_rbug.c
src/gallium/state_trackers/vega/bezier.c
src/gallium/state_trackers/vega/vg_context.c
src/gallium/state_trackers/xorg/xorg_crtc.c
src/gallium/state_trackers/xorg/xorg_driver.c
src/gallium/winsys/xlib/xlib_brw_context.c
src/mesa/main/mtypes.h
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/news.html | 2 | ||||
| -rw-r--r-- | docs/relnotes-7.6.1.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/news.html b/docs/news.html index 2abec2e635..a7d834e1c7 100644 --- a/docs/news.html +++ b/docs/news.html @@ -10,7 +10,7 @@ <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. 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. |