From: Brian Paul <brianp@vmware.com>
Date: Tue, 23 Mar 2010 15:14:17 +0000 (-0600)
Subject: Merge branch '7.8'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2689dd304c6d644b04c941e6da63e466be5de0d6;p=mesa.git

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
---

2689dd304c6d644b04c941e6da63e466be5de0d6