diff options
| author | Brian Paul <brianp@vmware.com> | 2009-02-09 09:22:22 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-02-09 09:22:22 -0700 |
| commit | e97681c7f551a2a2a6bd5eff0f4192a870c816c0 (patch) | |
| tree | dff2bf0e6d22efb92af131f64be0621ed316977c /docs | |
| parent | 1a46c8a062aea59de5cf55881104489db5d609e5 (diff) | |
| parent | b907d4cd8fafe719b4f87d877562829548937485 (diff) | |
mesa: merge gallium-0.2 into gallium-master-merge
Merge commit 'origin/gallium-0.2' into gallium-master-merge
Conflicts:
Makefile
docs/relnotes-7.4.html
docs/relnotes.html
src/mesa/drivers/dri/i965/brw_wm.h
src/mesa/main/imports.c
src/mesa/main/mtypes.h
src/mesa/main/texcompress.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_save_draw.c
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/relnotes-7.3.html | 2 | ||||
| -rw-r--r-- | docs/relnotes-7.4.html | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/relnotes-7.3.html b/docs/relnotes-7.3.html index 47ecaebec9..df8988443e 100644 --- a/docs/relnotes-7.3.html +++ b/docs/relnotes-7.3.html @@ -22,7 +22,7 @@ Some drivers don't support all the features required in OpenGL 2.1. </p> <p> See the <a href="install.html">Compiling/Installing page</a> for prerequisites -for DRI ardware acceleration. +for DRI hardware acceleration. </p> diff --git a/docs/relnotes-7.4.html b/docs/relnotes-7.4.html index 9a3ac01023..60ada854c1 100644 --- a/docs/relnotes-7.4.html +++ b/docs/relnotes-7.4.html @@ -37,6 +37,7 @@ tbd <h2>Bug fixes</h2> <ul> +<li>Assorted i965 driver bug fixes </ul> <h2>Changes</h2> |