Merge commit 'origin/mesa_7_7_branch'
authorMaciej Cencora <m.cencora@gmail.com>
Mon, 23 Nov 2009 21:14:48 +0000 (22:14 +0100)
committerMaciej Cencora <m.cencora@gmail.com>
Mon, 23 Nov 2009 21:14:48 +0000 (22:14 +0100)
commit5173d14cb5821637f22247d16be1b970f3762d6a
treee93826ec799fdbe513592e253278545e2584a7bf
parent18384af7491c408c4182b72807b02c11b55509f8
parent960464e42dce138fde11c379ce7744bc4be14aa2
Merge commit 'origin/mesa_7_7_branch'
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/drivers/dri/i965/brw_vtbl.c