Module: Mesa
Branch: gallium-0.2
Commit: 62dd7575f07f3ff9803118113746dba9219c1390
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=62dd7575f07f3ff9803118113746dba9219c1390
Author: Keith Whitwell <[EMAIL PROTECTED]>
Date: Tue Sep 23 17:24:39 2008 -0700
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/main/drawpix.c
src/mesa/shader/prog_uniform.c
src/mesa/shader/slang/slang_link.c
---
_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit