diff options
author | Christian König <[email protected]> | 2010-11-21 19:40:52 +0100 |
---|---|---|
committer | Christian König <[email protected]> | 2010-11-21 19:40:52 +0100 |
commit | e6b71530daea3059ee362d4df51575e27e026b22 (patch) | |
tree | 8df01693aa4bf44360647d79a340cbb4156aa91a /docs/relnotes-7.10.html | |
parent | 42c7291d2cb50c2bd94dd9346a8402a24303d66d (diff) | |
parent | 5e3733fadf08178fca7c9f20a0f4783f940383aa (diff) |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
Diffstat (limited to 'docs/relnotes-7.10.html')
-rw-r--r-- | docs/relnotes-7.10.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/relnotes-7.10.html b/docs/relnotes-7.10.html index 6706caf41df..1f5570d71d3 100644 --- a/docs/relnotes-7.10.html +++ b/docs/relnotes-7.10.html @@ -49,7 +49,7 @@ tbd <h2>Changes</h2> <ul> -<li>tbd</li> +<li>Upgraded glext.h to version 66</li> </ul> </body> |