diff options
| author | Brice Goglin <[email protected]> | 2010-02-24 20:51:54 +0100 |
|---|---|---|
| committer | Brice Goglin <[email protected]> | 2010-02-24 20:51:54 +0100 |
| commit | fec3df9cfb5522f77bbe6433850b81bb533c8a2e (patch) | |
| tree | 34dc5024ccf812ec47a14a47d93b0118186c6369 /docs | |
| parent | eef7b39a3618ca77dfb77111b4daad2acf2c1824 (diff) | |
| parent | f0e99179bcf95f39ce7c4d2c2270e8a4357eaf19 (diff) | |
Merge branch 'upstream-experimental' into debian-experimental
Conflicts:
scons/crossmingw.py
scons/gallium.py
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/osmesa.html | 2 | ||||
| -rw-r--r-- | docs/relnotes-7.7.1.html | 1 | ||||
| -rw-r--r-- | docs/repository.html | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/docs/osmesa.html b/docs/osmesa.html index 629d054f419..525da4d42fd 100644 --- a/docs/osmesa.html +++ b/docs/osmesa.html @@ -26,7 +26,7 @@ more information about the API functions. </p> <p> -There are several examples of OSMesa in the <code>progs/osdemo/</code> +There are several examples of OSMesa in the <code>progs/osdemos/</code> directory. </p> diff --git a/docs/relnotes-7.7.1.html b/docs/relnotes-7.7.1.html index 959efd9e57c..c3d42c1d546 100644 --- a/docs/relnotes-7.7.1.html +++ b/docs/relnotes-7.7.1.html @@ -44,6 +44,7 @@ tbd <li>Fixed mipmap generation bug caused by invalid viewport state. <li>Gallium SSE codegen for XPD didn't always work. <li>Fixed Windows build. +<li>Fixed broken glMultiDrawElements(). </ul> diff --git a/docs/repository.html b/docs/repository.html index ed385288eab..15621b7ebff 100644 --- a/docs/repository.html +++ b/docs/repository.html @@ -1,6 +1,6 @@ <HTML> -<TITLE>Cocd Repository</TITLE> +<TITLE>Code Repository</TITLE> <link rel="stylesheet" type="text/css" href="mesa.css"></head> |