OSDN Git Service

Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Wed, 12 Dec 2007 02:11:19 +0000 (13:11 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Wed, 12 Dec 2007 02:11:19 +0000 (13:11 +1100)
commit58915980127ab4e57b6b40a8c42f44be4a12aeae
tree176f379bb19fc8caacf96112a1ebeda8aea90a16
parente282d22d512d2a5871d0fabb7d855a16b4593c50
parentb2ad30d57197c2167789e4f3f5b34af6df56dde2
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1

Conflicts:

src/mesa/pipe/Makefile
src/mesa/pipe/Makefile