Merge branch 'kasanen-post-process-v2'
authorBrian Paul <brianp@vmware.com>
Thu, 25 Aug 2011 16:12:12 +0000 (10:12 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 25 Aug 2011 16:12:12 +0000 (10:12 -0600)
commit6571c0774af1f5ebd0fab40bf4769702d3c9ded5
treef524efa213c32f8ef4d77b98076715efecf2fcd1
parente3a7cb4a6c94efe250c0212f062930e2026a861d
parent88bc4eda0f93266e1e5dc40f933872c78d497aa6
Merge branch 'kasanen-post-process-v2'

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