Module: Mesa Branch: master Commit: 2689dd304c6d644b04c941e6da63e466be5de0d6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2689dd304c6d644b04c941e6da63e466be5de0d6
Author: Brian Paul <[email protected]> Date: Tue Mar 23 09:14:17 2010 -0600 Merge branch '7.8' Conflicts: Makefile src/gallium/state_trackers/glx/xlib/xm_api.c src/mesa/drivers/dri/intel/intel_blit.c src/mesa/drivers/dri/intel/intel_pixel_copy.c src/mesa/main/version.h --- _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
