summaryrefslogtreecommitdiff
path: root/progs/images
diff options
context:
space:
mode:
authorChia-I Wu <olv@lunarg.com>2010-03-10 09:48:33 +0800
committerChia-I Wu <olv@lunarg.com>2010-03-10 09:50:19 +0800
commit1f92cf55e1d19864a51e620a14c6912e94cd14ea (patch)
tree0dbc6b0a62db20a841f310ab222615d171eba437 /progs/images
parent02716cf7d16543d5dedc6e550895d77139ad2432 (diff)
st/egl: Fix build errors in ximage backend after merge.
This fixes assorted merge conflicts when master is merged to gallium-sw-api-2 in 0c96690a5b6e1c2d114e7ec5f1e9d60a4ff2a330.
Diffstat (limited to 'progs/images')
0 files changed, 0 insertions, 0 deletions