projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 02716cf) | patch
st/egl: Fix build errors in ximage backend after merge.
authorChia-I Wu <olv@lunarg.com>
Wed, 10 Mar 2010 01:48:33 +0000 (09:48 +0800)
committerChia-I Wu <olv@lunarg.com>
Wed, 10 Mar 2010 01:50:19 +0000 (09:50 +0800)
commit1f92cf55e1d19864a51e620a14c6912e94cd14ea
tree0dbc6b0a62db20a841f310ab222615d171eba437tree
parent02716cf7d16543d5dedc6e550895d77139ad2432commit | 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.
src/gallium/state_trackers/egl/x11/native_x11.c diff | blob | history
src/gallium/state_trackers/egl/x11/native_x11.h diff | blob | history
src/gallium/state_trackers/egl/x11/native_ximage.c diff | blob | history