From: Brian Paul <brianp@vmware.com>
Date: Sat, 24 Jan 2009 00:39:44 +0000 (-0700)
Subject: Merge branch 'tex_combine4'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cba5ce166523a8bb6888a0ea28a26e30204f30a4;p=mesa.git

Merge branch 'tex_combine4'
---

cba5ce166523a8bb6888a0ea28a26e30204f30a4