diff options
| author | Brian Paul <[email protected]> | 2010-01-04 19:16:24 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-01-04 19:16:24 -0700 |
| commit | 5ac16495a2772886100789f04e1a7d65068e9a40 (patch) | |
| tree | 3a387294b977841ac4255ff8fbfedd1ce2dc8946 /docs/relnotes.html | |
| parent | bfc34c880492f15dc47db30e88f888d1c48d5e70 (diff) | |
| parent | 6d845808589b9df84f23551b122533a55dce6bd5 (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
docs/relnotes.html
src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
src/gallium/drivers/r300/r300_cs.h
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
src/mesa/main/enums.c
Diffstat (limited to 'docs/relnotes.html')
| -rw-r--r-- | docs/relnotes.html | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/relnotes.html b/docs/relnotes.html index d0d9b6e5b98..f1f95c5d3ca 100644 --- a/docs/relnotes.html +++ b/docs/relnotes.html @@ -13,7 +13,9 @@ The release notes summarize what's new or changed in each Mesa release. </p> <UL> +<<<<<<< HEAD:docs/relnotes.html <LI><A HREF="relnotes-7.8.html">7.8 release notes</A> +<LI><A HREF="relnotes-7.7.1.html">7.7.1 release notes</A> <LI><A HREF="relnotes-7.7.html">7.7 release notes</A> <LI><A HREF="relnotes-7.6.1.html">7.6.1 release notes</A> <LI><A HREF="relnotes-7.6.html">7.6 release notes</A> |