| commit | 25024d948298a9f3f3210a0b91486f79a3917b0f | [log] [tgz] |
|---|---|---|
| author | Brian Paul <brianp@vmware.com> | Thu Dec 31 09:02:27 2009 -0700 |
| committer | Brian Paul <brianp@vmware.com> | Thu Dec 31 09:02:27 2009 -0700 |
| tree | 5647623b9781193b7ed55c8d9233404938aeb853 | |
| parent | d14beea534dcb2b3ae2ae1f7ee0ba5dcdef3dba3 [diff] | |
| parent | 195e7657e2f15f7ad8b22042b86bcf33c5bba76b [diff] |
Merge branch 'mesa_7_7_branch' Conflicts: configs/darwin src/gallium/auxiliary/util/u_clear.h src/gallium/state_trackers/xorg/xorg_exa_tgsi.c src/mesa/drivers/dri/i965/brw_draw_upload.c