diff options
| author | Roland Scheidegger <[email protected]> | 2010-01-15 18:09:45 +0100 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2010-01-15 18:09:45 +0100 |
| commit | 5e5d0ad08167c178fcda005862e3dbead3e8c482 (patch) | |
| tree | f08d0cf2725fede62ada26e8815d6d9eeebdf337 /src/glut/glx/glut_util.c | |
| parent | 1c4ad778126788cebcb54342837042bfe432d504 (diff) | |
| parent | 70c8d2a29724d018bacc4a68ddc61db08faea00d (diff) | |
Merge branch 'gallium-noconstbuf'
Conflicts:
src/gallium/drivers/softpipe/sp_draw_arrays.c
src/mesa/state_tracker/st_draw_feedback.c
Diffstat (limited to 'src/glut/glx/glut_util.c')
0 files changed, 0 insertions, 0 deletions