projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6ad846e 03615c0)
Merge remote-tracking branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Sat, 7 May 2011 12:11:40 +0000 (14:11 +0200)
committerChristian König <deathsimple@vodafone.de>
Sat, 7 May 2011 12:11:40 +0000 (14:11 +0200)
commit213b9004a6ee033a16af3dcd187aa68b56c39858
treef577f4dc276f70dad63f102f69f87f4d566186eftree
parent6ad846ee78d9d8ba93dcecdefbf89f2b981333efcommit | diff
parent03615c02d81437cf546609fc6a39c6c73be39360commit | diff
Merge remote-tracking branch 'origin/master' into pipe-video

Conflicts:
src/gallium/drivers/r600/r600_state.c
12 files changed:
configure.ac diff1 | diff2 | blob | history
src/gallium/auxiliary/util/u_format.csv diff1 | diff2 | blob | history
src/gallium/drivers/r600/Makefile diff1 | diff2 | blob | history
src/gallium/drivers/r600/eg_state_inlines.h diff1 | diff2 | blob | history
src/gallium/drivers/r600/r600_pipe.c diff1 | diff2 | blob | history
src/gallium/drivers/r600/r600_state.c diff1 | diff2 | blob | history
src/gallium/drivers/r600/r600_state_inlines.h diff1 | diff2 | blob | history
src/gallium/drivers/r600/r600_texture.c diff1 | diff2 | blob | history
src/gallium/include/pipe/p_defines.h diff1 | diff2 | blob | history
src/gallium/winsys/r600/drm/r600_bo.c diff1 | diff2 | blob | history
src/gallium/winsys/r600/drm/r600_hw_context.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_format.c diff1 | diff2 | blob | history