| commit | bb4c5d72d7c7cb1d9e7016e2c07c36875f30011a | [log] [tgz] |
|---|---|---|
| author | Marek Olšák <maraeo@gmail.com> | Fri May 11 16:38:13 2012 +0200 |
| committer | Marek Olšák <maraeo@gmail.com> | Fri May 11 16:38:13 2012 +0200 |
| tree | 153444ff535900f82ae63b5af8ccd09fb2f063af | |
| parent | 96956dc5076fc03b9290368ca90e3f3b870ee613 [diff] | |
| parent | 8dd3e341b337ca2d22bcc0e7548a78a6c36ca77d [diff] |
Merge branch 'gallium-userbuf' Conflicts: src/gallium/docs/source/screen.rst src/gallium/drivers/nv50/nv50_state.c src/gallium/include/pipe/p_defines.h src/mesa/state_tracker/st_draw.c