projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db14a80 ea373df)
Merge branch '7.8'
authorBrian Paul <brianp@vmware.com>
Tue, 27 Apr 2010 14:34:06 +0000 (08:34 -0600)
committerBrian Paul <brianp@vmware.com>
Tue, 27 Apr 2010 14:34:06 +0000 (08:34 -0600)
Conflicts:

src/gallium/drivers/nv30/nv30_context.c
src/gallium/drivers/nv40/nv40_context.c
src/gallium/drivers/nv40/nv40_state_emit.c


Trivial merge