Merge branch 'mesa_7_6_branch' of git://anongit.freedesktop.org/mesa/mesa into debian-unstable
Conflicts: progs/tests/Makefile progs/tests/prog_parameter.c
Showing
- docs/relnotes-7.6.1.html 1 addition, 0 deletionsdocs/relnotes-7.6.1.html
- progs/demos/projtex.c 1 addition, 0 deletionsprogs/demos/projtex.c
- progs/samples/rgbtoppm.c 6 additions, 1 deletionprogs/samples/rgbtoppm.c
- progs/util/readtex.c 6 additions, 1 deletionprogs/util/readtex.c
- src/gallium/auxiliary/draw/draw_pt.c 2 additions, 1 deletionsrc/gallium/auxiliary/draw/draw_pt.c
- src/gallium/auxiliary/rbug/rbug_connection.c 1 addition, 0 deletionssrc/gallium/auxiliary/rbug/rbug_connection.c
- src/gallium/drivers/i915simple/i915_debug.c 1 addition, 0 deletionssrc/gallium/drivers/i915simple/i915_debug.c
- src/gallium/drivers/i915simple/i915_screen.c 1 addition, 0 deletionssrc/gallium/drivers/i915simple/i915_screen.c
- src/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c 3 additions, 3 deletionssrc/gallium/drivers/llvmpipe/lp_bld_tgsi_soa.c
- src/gallium/state_trackers/egl/egl_tracker.c 1 addition, 1 deletionsrc/gallium/state_trackers/egl/egl_tracker.c
- src/glx/x11/drisw_glx.c 3 additions, 1 deletionsrc/glx/x11/drisw_glx.c
- src/mesa/drivers/dri/common/dri_util.c 6 additions, 5 deletionssrc/mesa/drivers/dri/common/dri_util.c
- src/mesa/drivers/dri/i915/i915_debug.c 1 addition, 0 deletionssrc/mesa/drivers/dri/i915/i915_debug.c
- src/mesa/drivers/dri/r600/r700_assembler.c 9 additions, 17 deletionssrc/mesa/drivers/dri/r600/r700_assembler.c
- src/mesa/drivers/dri/r600/r700_chip.c 6 additions, 2 deletionssrc/mesa/drivers/dri/r600/r700_chip.c
- src/mesa/main/fog.c 8 additions, 3 deletionssrc/mesa/main/fog.c
- src/mesa/main/light.c 16 additions, 4 deletionssrc/mesa/main/light.c
- src/mesa/main/points.c 8 additions, 3 deletionssrc/mesa/main/points.c
- src/mesa/main/texgen.c 4 additions, 2 deletionssrc/mesa/main/texgen.c
- src/mesa/main/texobj.c 1 addition, 1 deletionsrc/mesa/main/texobj.c
Loading
Please register or sign in to comment