projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7831515 da876fa)
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
authorBrian Paul <brianp@vmware.com>
Sun, 27 Dec 2009 22:31:08 +0000 (15:31 -0700)
committerBrian Paul <brianp@vmware.com>
Sun, 27 Dec 2009 22:31:08 +0000 (15:31 -0700)
commitd0b7ff551ab25153e3023871af3daa65b394a828
treecfff232421273b15820b4ab6773219ba676e52d5tree
parent7831515e69ac875b1ac0b1b248ab10c6cf37bf52commit | diff
parentda876fa3a5df77763fe106b5e0a17b2e672a506ccommit | diff
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
src/gallium/auxiliary/util/u_network.c
src/gallium/auxiliary/util/u_network.h
src/gallium/drivers/i915/i915_state.c
src/gallium/drivers/trace/tr_rbug.c
src/gallium/state_trackers/vega/bezier.c
src/gallium/state_trackers/vega/vg_context.c
src/gallium/state_trackers/xorg/xorg_crtc.c
src/gallium/state_trackers/xorg/xorg_driver.c
src/gallium/winsys/xlib/xlib_brw_context.c
src/mesa/main/mtypes.h
src/gallium/auxiliary/util/u_clear.h diff1 | diff2 | blob | history
src/gallium/drivers/i915/i915_state.c diff1 | | blob | history
src/gallium/state_trackers/egl/egl_surface.c diff1 | diff2 | blob | history
src/gallium/state_trackers/vega/arc.c diff1 | diff2 | blob | history
src/gallium/state_trackers/vega/bezier.c diff1 | diff2 | blob | history
src/gallium/state_trackers/vega/vg_context.c diff1 | diff2 | blob | history
src/gallium/state_trackers/xorg/xorg_crtc.c diff1 | diff2 | blob | history
src/gallium/state_trackers/xorg/xorg_driver.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i915/i915_program.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i965/brw_eu_emit.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/intel/intel_pixel_bitmap.c diff1 | diff2 | blob | history