Module: Mesa Branch: master Commit: 7567f05199f1ca114cc57e3a11ac101d3707f819 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7567f05199f1ca114cc57e3a11ac101d3707f819
Author: Brian Paul <[email protected]> Date: Tue Apr 27 08:34:06 2010 -0600 Merge branch '7.8' Conflicts: src/gallium/drivers/nv30/nv30_context.c src/gallium/drivers/nv40/nv40_context.c src/gallium/drivers/nv40/nv40_state_emit.c --- _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
