Merge branch 'gallium-strict-aliasing'
authorRoland Scheidegger <sroland@vmware.com>
Tue, 8 Dec 2009 18:26:20 +0000 (19:26 +0100)
committerRoland Scheidegger <sroland@vmware.com>
Tue, 8 Dec 2009 18:26:20 +0000 (19:26 +0100)
commit4ebc54795dc93f7eee200312abfa2da1b49506e3
tree3303b9bd235763ddfe55603f3e16d54fc41d83c5
parentbc7567d9665924650c43c661d07ae9a922554bee
parentee1720b99dfb5964962f2346406a4e3e88374a68
Merge branch 'gallium-strict-aliasing'
src/gallium/drivers/r300/r300_state.c
src/gallium/include/pipe/p_state.h
src/gallium/state_trackers/python/st_device.c