Module: Mesa Branch: master Commit: 124f5875eae0b914d5c679fec6b25633907ad843 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=124f5875eae0b914d5c679fec6b25633907ad843
Author: Brian Paul <[email protected]> Date: Tue Sep 29 09:46:49 2009 -0600 Merge branch 'mesa_7_6_branch' Conflicts: Makefile configs/default docs/relnotes.html src/gallium/drivers/softpipe/sp_context.c src/gallium/drivers/softpipe/sp_tile_cache.c src/mesa/main/version.h --- _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
