[965] fix bad conflict resolution in debug code.
authorEric Anholt <eric@anholt.net>
Mon, 17 Dec 2007 22:42:21 +0000 (14:42 -0800)
committerEric Anholt <eric@anholt.net>
Mon, 17 Dec 2007 22:42:31 +0000 (14:42 -0800)
commit8336f3ffb7e4033337a1d0eafef43cbf3329f499
treec13bd2972d8f599328d02a6c8684287db06383e4
parent2c9e515d8607fb91f08c500a841cdf7f32bda346
[965] fix bad conflict resolution in debug code.
src/mesa/drivers/dri/i965/brw_state_dump.c