Merge remote-tracking branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Sat, 4 Jun 2011 22:11:41 +0000 (00:11 +0200)
committerChristian König <deathsimple@vodafone.de>
Sat, 4 Jun 2011 22:11:41 +0000 (00:11 +0200)
commit1eb957bb4108123bea95b818e0544e3b5f255e08
treed7febd8e6cc841ab16dca53f031322ec47d5ccd9
parenta6c76c8a90dc8995feed3c61b02dbd8408149036
parent6491e9593d5cbc5644eb02593a2f562447efdcbb
Merge remote-tracking branch 'origin/master' into pipe-video
configs/autoconf.in
configs/linux-dri
configure.ac
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_state.c
src/gallium/winsys/r600/drm/r600_hw_context.c
src/mesa/state_tracker/st_format.c