Merge branch '7.8'
authorMichel Dänzer <daenzer@vmware.com>
Wed, 10 Mar 2010 17:33:17 +0000 (18:33 +0100)
committerMichel Dänzer <daenzer@vmware.com>
Wed, 10 Mar 2010 17:33:17 +0000 (18:33 +0100)
commita56da1005d30da60701e33b75d5f4f37096df060
tree839d749316482cd858843d51ab2198cece18797b
parenta840bf4146b7e06cc94eb59d8265fe6593b232c4
parent766d90f1a201d8fd19e49df14d712efbb82223b4
Merge branch '7.8'
src/gallium/state_trackers/xorg/xorg_crtc.c
src/gallium/state_trackers/xorg/xorg_driver.c