Merge branch 'gallium-new-formats'
authorRoland Scheidegger <sroland@vmware.com>
Wed, 31 Mar 2010 14:57:05 +0000 (16:57 +0200)
committerRoland Scheidegger <sroland@vmware.com>
Wed, 31 Mar 2010 14:57:05 +0000 (16:57 +0200)
commitd97f6963aee71d8fafa2a94a5fe1f3ca4b4ef16d
tree4b6fa4c2104dae852616908923d00b723cca082c
parent96bf4aff5bd674bba5d83ab32c46024a686c1a1d
parent56b34e54f29cdd0a479219695c6559c44a41a76c
Merge branch 'gallium-new-formats'

Conflicts:
src/gallium/auxiliary/util/u_format.csv
src/gallium/auxiliary/util/u_format_access.py
src/gallium/auxiliary/util/u_format_pack.py
src/gallium/auxiliary/util/u_format_access.py
src/gallium/auxiliary/util/u_format_pack.py
src/gallium/drivers/i965/brw_screen_texture.c
src/gallium/state_trackers/glx/xlib/xm_api.c