Merge branch 'gallium-tex-surface' into gallium-0.1
authorJakob Bornecrantz <jakob@tungstengraphics.com>
Mon, 26 May 2008 11:04:25 +0000 (13:04 +0200)
committerJakob Bornecrantz <jakob@tungstengraphics.com>
Mon, 26 May 2008 11:04:25 +0000 (13:04 +0200)
commite3ddafd1d32192f4638d4930627ad66624325561
treed538b76af6c559593c6507ad7c2eb415d1b28c75
parent359058e7b77ddbac5eec7e8d1c77232bcbb1adbf
parent7fbb61eedd4b07f07007a172cea227d5c363b908
Merge branch 'gallium-tex-surface' into gallium-0.1

Conflicts:

src/gallium/include/pipe/p_util.h
src/gallium/drivers/i915simple/i915_state.c
src/gallium/include/pipe/p_util.h
src/gallium/winsys/dri/intel/intel_winsys_pipe.c