Merge branch 'gallium-no-rhw-position'
authorMichal Krol <michal@vmware.com>
Tue, 2 Mar 2010 12:35:30 +0000 (13:35 +0100)
committerMichal Krol <michal@vmware.com>
Tue, 2 Mar 2010 12:35:30 +0000 (13:35 +0100)
commit4ca70c489baed3e23dbf5e5e5794385113e22252
treec2fb1cc4f46e2ffe2c84ce4680fc68fed29f02de
parentc1c7fa5192c4fb3f51fb67c81e58713d61ff0c93
parentff9ddf4d39be9e36d3e1dd9e10e889efa40dfb1e
Merge branch 'gallium-no-rhw-position'

Conflicts:
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_state_derived.c
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_context.h
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/r300/r300_state_derived.c
src/gallium/drivers/softpipe/sp_video_context.c