From: Brian Paul Date: Tue, 5 Jan 2010 02:16:24 +0000 (-0700) Subject: Merge branch 'mesa_7_7_branch' X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5ac16495a2772886100789f04e1a7d65068e9a40;p=mesa.git 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 --- 5ac16495a2772886100789f04e1a7d65068e9a40 diff --cc docs/relnotes.html index d0d9b6e5b98,b06548ae61a..f1f95c5d3ca --- a/docs/relnotes.html +++ b/docs/relnotes.html @@@ -13,7 -13,7 +13,9 @@@ The release notes summarize what's new