projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4598942
2b5618f
)
Merge commit 'mesa_7_6_branch' into mesa_7_7_branch
author
Jakob Bornecrantz
<jakob@vmware.com>
Wed, 2 Dec 2009 13:52:51 +0000
(14:52 +0100)
committer
Jakob Bornecrantz
<jakob@vmware.com>
Wed, 2 Dec 2009 13:52:51 +0000
(14:52 +0100)
Conflicts:
src/mesa/main/version.h
1
2
src/mesa/drivers/dri/intel/intel_extensions.c
patch
|
diff1
|
diff2
|
blob
|
history
src/mesa/drivers/dri/r200/r200_context.c
patch
|
diff1
|
diff2
|
blob
|
history
src/mesa/drivers/dri/r200/r200_state_init.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/mesa/drivers/dri/intel/intel_extensions.c
Simple merge
diff --cc
src/mesa/drivers/dri/r200/r200_context.c
Simple merge
diff --cc
src/mesa/drivers/dri/r200/r200_state_init.c
Simple merge
projects / mesa.git / commitdiff