Module: Mesa Branch: master Commit: 9b21b3c52a8a7d58d08151d1a6bf25c472dec213 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b21b3c52a8a7d58d08151d1a6bf25c472dec213
Author: Michal Krol <[email protected]> Date: Tue Jan 5 11:04:50 2010 +0100 Merge branch 'master' into instanced-arrays Conflicts: src/gallium/auxiliary/tgsi/tgsi_dump.c src/gallium/include/pipe/p_shader_tokens.h --- _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
