| commit | b748a9f574361273df6b05c06c647ac4fd9b3e41 | [log] [tgz] |
|---|---|---|
| author | Roland Scheidegger <sroland@vmware.com> | Fri Nov 27 17:40:24 2009 +0100 |
| committer | Roland Scheidegger <sroland@vmware.com> | Fri Nov 27 17:40:24 2009 +0100 |
| tree | 0ca1854cb84b5ae3d5d541873f2f937beb4ddd58 | |
| parent | c95cbd45c657ac47e908a4d99d118737034bde43 [diff] |
r300g,llvmpipe: fix some more merge problems