| commit | 4f1c9f7e510122b32c82ee9adbdb4987dae27afe | [log] [tgz] |
|---|---|---|
| author | Eric Anholt <eric@anholt.net> | Wed Sep 19 11:05:36 2007 -0700 |
| committer | Eric Anholt <eric@anholt.net> | Thu Sep 20 09:04:20 2007 -0700 |
| tree | 30cb409cf46cd11a6a14178985f7c69468e5b0f9 | |
| parent | e3745dac59602a9d21b49d602646de5aef95075f [diff] | |
| parent | 45899a494c578d406b29e5ee17c0f1b6bf12c2de [diff] |
Merge branch 'master' into i915-unification Conflicts: src/mesa/drivers/dri/common/dri_drmpool.c src/mesa/drivers/dri/i915tex/i915_vtbl.c src/mesa/drivers/dri/i915tex/intel_batchbuffer.c src/mesa/drivers/dri/i915tex/intel_context.c