Module: Mesa Branch: master Commit: 4dcdf3b9c67f1481d46c1decba84c9c55698db4c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4dcdf3b9c67f1481d46c1decba84c9c55698db4c
Author: Roland Scheidegger <[email protected]> Date: Thu Nov 26 01:15:25 2009 +0100 Merge commit 'origin/st-shader-varients' Conflicts: src/mesa/state_tracker/st_atom_shader.c src/mesa/state_tracker/st_program.c --- _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
