projects
/
profile
/
ivi
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
263de4b
4d9c19d
)
Merge branch 'nouveau-gallium-0.1' into darktama-gallium-0.1
author
Ben Skeggs
<skeggsb@gmail.com>
Sat, 16 Feb 2008 05:20:40 +0000
(16:20 +1100)
committer
Ben Skeggs
<skeggsb@gmail.com>
Sat, 16 Feb 2008 05:20:40 +0000
(16:20 +1100)
Conflicts:
src/mesa/pipe/nouveau/nouveau_stateobj.h
src/mesa/pipe/nv40/nv40_context.c
src/mesa/pipe/nv40/nv40_miptree.c
Trivial merge
projects / profile / ivi / mesa.git / commitdiff