Module: Mesa Branch: gallium-resources Commit: 1997231916144485c3c4a36f53eda39fce460272 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1997231916144485c3c4a36f53eda39fce460272
Author: Keith Whitwell <[email protected]> Date: Wed Mar 17 08:46:38 2010 +0000 Merge commit 'origin/master' into gallium-resources Conflicts: src/gallium/auxiliary/Makefile src/gallium/auxiliary/util/u_blit.c src/gallium/auxiliary/util/u_blit.h src/gallium/auxiliary/util/u_gen_mipmap.c src/gallium/auxiliary/util/u_gen_mipmap.h src/mesa/state_tracker/st_cb_texture.c src/mesa/state_tracker/st_gen_mipmap.c --- _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
