Module: Mesa Branch: gallium-mesa-7.4 Commit: eb1970b725d8931ecbdada96bc3035ed1239a367 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=eb1970b725d8931ecbdada96bc3035ed1239a367
Author: Alan Hourihane <al...@vmware.com> Date: Fri Apr 3 09:26:18 2009 +0100 Merge commit 'origin/mesa_7_4_branch' into gallium-mesa-7.4 Conflicts: src/mesa/main/texparam.c --- _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit