diff options
| author | Brian Paul <[email protected]> | 2009-02-10 16:44:02 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-02-10 16:44:02 -0700 |
| commit | 5340b6dff73a0a23531ce2a5f28fba8303adab6e (patch) | |
| tree | b141fc3648568dd8b941c966059e6ed32a8bd0ad /docs | |
| parent | 9fd26daec24f21dbe17afcb2e2ab272667ee9a69 (diff) | |
| parent | ee4c921b65fb76998711f3c40330505cbc49a0e0 (diff) | |
Merge commit 'origin/gallium-master-merge'
This is the big merge of the gallium-0.2 branch into master.
gallium-master-merge was just the staging area for it.
Both gallium-0.2 and gallium-master-merge are considered closed now.
Conflicts:
progs/demos/Makefile
src/mesa/main/state.c
src/mesa/main/texenvprogram.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 47ecaebec99..df8988443ef 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 9a3ac010236..60ada854c16 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> |