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)
commit3b8bc1f46758d4da9155419fcf558a493e729501
tree0dbfb4ae1ed6b49caaed3e662b27db30fe2e8801
parentffe58739da9eee2e99682747cc8f26e412c87430
parentffa2659204121f703208782ff225a22e0c21b173
Merge branch 'master' of git+ssh://michal@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
src/mesa/drivers/dri/i915tex/intel_context.c
src/mesa/drivers/x11/xm_api.c
src/mesa/drivers/x11/xmesaP.h
src/mesa/main/mtypes.h