Merge branch 'gallium-new-formats'

author Roland Scheidegger <sroland@vmware.com>

Wed, 31 Mar 2010 14:57:05 +0000 (16:57 +0200)

committer Roland Scheidegger <sroland@vmware.com>

Wed, 31 Mar 2010 14:57:05 +0000 (16:57 +0200)
author Roland Scheidegger <sroland@vmware.com>
Wed, 31 Mar 2010 14:57:05 +0000 (16:57 +0200)
committer Roland Scheidegger <sroland@vmware.com>
Wed, 31 Mar 2010 14:57:05 +0000 (16:57 +0200)
diff --cc src/gallium/auxiliary/util/u_format_access.py
Simple merge
diff --cc src/gallium/auxiliary/util/u_format_pack.py
Simple merge
diff --cc src/gallium/drivers/i965/brw_screen_texture.c
Simple merge
diff --cc src/gallium/state_trackers/glx/xlib/xm_api.c
Simple merge
author	Roland Scheidegger <sroland@vmware.com>
	Wed, 31 Mar 2010 14:57:05 +0000 (16:57 +0200)
committer	Roland Scheidegger <sroland@vmware.com>
	Wed, 31 Mar 2010 14:57:05 +0000 (16:57 +0200)
		1	2
src/gallium/auxiliary/util/u_format_access.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/util/u_format_pack.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/i965/brw_screen_texture.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/glx/xlib/xm_api.c	patch \|	diff1 \|	diff2 \|	blob \| history