Module: Mesa Branch: gallium-mesa-7.4 Commit: 15287b40a8629bdffce36057cf7b6c5949bb63b4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=15287b40a8629bdffce36057cf7b6c5949bb63b4
Author: Alan Hourihane <al...@vmware.com> Date: Fri Mar 6 09:43:27 2009 +0000 Merge commit 'origin/mesa_7_4_branch' into gallium-mesa-7.4 Conflicts: src/mesa/main/bufferobj.c src/mesa/main/state.c --- _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit