summaryrefslogtreecommitdiff
path: root/src/egl
diff options
context:
space:
mode:
authorRoland Scheidegger <sroland@vmware.com>2010-01-15 18:09:45 +0100
committerRoland Scheidegger <sroland@vmware.com>2010-01-15 18:09:45 +0100
commit5e5d0ad08167c178fcda005862e3dbead3e8c482 (patch)
treef08d0cf2725fede62ada26e8815d6d9eeebdf337 /src/egl
parent1c4ad778126788cebcb54342837042bfe432d504 (diff)
parent70c8d2a29724d018bacc4a68ddc61db08faea00d (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/egl')
0 files changed, 0 insertions, 0 deletions