projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ffe5873 ffa2659)
Merge branch 'master' of git+ssh://michal@git.freedesktop.org/git/mesa/mesa into...
authormichal <michal@michal-laptop.(none)>
Fri, 6 Jul 2007 15:53:44 +0000 (17:53 +0200)
committermichal <michal@michal-laptop.(none)>
Fri, 6 Jul 2007 15:53:44 +0000 (17:53 +0200)
1  2 
src/mesa/drivers/dri/i915tex/intel_context.c patch | diff1 | diff2 | blob | history
src/mesa/drivers/x11/xm_api.c patch | diff1 | diff2 | blob | history
src/mesa/drivers/x11/xmesaP.h patch | diff1 | diff2 | blob | history
src/mesa/main/mtypes.h patch | diff1 | diff2 | blob | history

diff --cc src/mesa/drivers/x11/xm_api.c
Simple merge
diff --cc src/mesa/drivers/x11/xmesaP.h
Simple merge
diff --cc src/mesa/main/mtypes.h
Simple merge