| commit | a1af8eec66c5f7ec421e8011b41c1a7c36319f9f | [log] [tgz] |
|---|---|---|
| author | José Fonseca <jfonseca@vmware.com> | Fri Feb 05 13:48:35 2010 +0000 |
| committer | José Fonseca <jfonseca@vmware.com> | Fri Feb 05 13:48:35 2010 +0000 |
| tree | bc76a431699807cf60cf8ba82ff6b3b1ff34f309 | |
| parent | c036d13d7d2cc905226fe53ebd86a18da808963f [diff] | |
| parent | bee9964b29b2428ee75e2d1efc0e1d2c2518a417 [diff] |
Merge remote branch 'origin/lp-binning' Conflicts: src/gallium/auxiliary/util/u_dl.c src/gallium/auxiliary/util/u_time.h src/gallium/drivers/llvmpipe/lp_state_derived.c src/gallium/drivers/llvmpipe/lp_state_surface.c src/gallium/drivers/llvmpipe/lp_tex_cache.c src/gallium/drivers/llvmpipe/lp_tile_cache.c