| commit | 1e645b365900cf1c71ca5594bd6b549a1f203040 | [log] [tgz] |
|---|---|---|
| author | Ian Romanick <ian.d.romanick@intel.com> | Fri Jul 25 18:31:44 2008 -0700 |
| committer | Ian Romanick <ian.d.romanick@intel.com> | Fri Jul 25 18:31:44 2008 -0700 |
| tree | d114e55df428550c9829acf929b9fb7bcb89c429 | |
| parent | e5022c3fdf9888857f22f9a1690035ff3f90d36b [diff] | |
| parent | 9bc9e0ecb0fb2069b2c123e665eb2118e358098f [diff] |
Merge branch 'master' into drm-gem Conflicts: src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/i965/brw_wm_surface_state.c