projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c696dd0 0c75cb5)
Merge branch 'master' into radeon-rewrite
authorMichel Dänzer <daenzer@vmware.com>
Wed, 20 May 2009 15:00:48 +0000 (17:00 +0200)
committerMichel Dänzer <daenzer@vmware.com>
Wed, 20 May 2009 15:00:48 +0000 (17:00 +0200)
Conflicts:
src/mesa/drivers/dri/r300/r300_context.c
src/mesa/drivers/dri/r300/r300_texstate.c


Trivial merge