From: Brian Paul <brianp@vmware.com>
Date: Thu, 25 Aug 2011 16:12:12 +0000 (-0600)
Subject: Merge branch 'kasanen-post-process-v2'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6571c0774af1f5ebd0fab40bf4769702d3c9ded5;p=mesa.git

Merge branch 'kasanen-post-process-v2'

Conflicts:
	src/gallium/auxiliary/Makefile
	src/gallium/auxiliary/SConscript
---

6571c0774af1f5ebd0fab40bf4769702d3c9ded5