Module: Mesa Branch: gallium-mesa-7.4 Commit: 8c1d07dc79f82fad0421b8696173d9dabd0647a2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8c1d07dc79f82fad0421b8696173d9dabd0647a2
Author: Alan Hourihane <al...@vmware.com> Date: Wed Feb 18 12:59:13 2009 +0000 Merge commit 'origin/mesa_7_4_branch' into gallium-mesa-7.4 Conflicts: src/mesa/main/state.c --- _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit