projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3a7cb4 88bc4ed)
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)
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript


Trivial merge