Module: Mesa Branch: gallium-resources Commit: 058c5697bda4c9cf7b49d26ee27a34586544efaa URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=058c5697bda4c9cf7b49d26ee27a34586544efaa
Author: Keith Whitwell <[email protected]> Date: Tue Mar 23 06:40:39 2010 -0700 Merge commit 'origin/gallium-resources' into gallium-buffer-usage-cleanup Conflicts: src/gallium/state_trackers/vega/api_filters.c src/mesa/state_tracker/st_cb_drawpixels.c --- _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
