Merge branch 'master' of git+ssh://michal@git.freedesktop.org/git/mesa/mesa into...
authormichal <michal@michal-laptop.(none)>
Fri, 27 Jul 2007 08:05:40 +0000 (10:05 +0200)
committermichal <michal@michal-laptop.(none)>
Fri, 27 Jul 2007 08:05:40 +0000 (10:05 +0200)
commite0a26b046764ae80748b347395ab1b27de83651e
treeea702756a3e9cedc3b3c41241cbff0956ddc82bc
parent0360b49afbcd839f99ba0745d01cf9dc5be4d122
parente3cef5887540016a6d198598cb50bebe09e3f4cf
Merge branch 'master' of git+ssh://michal@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
src/mesa/drivers/dri/i915tex/intel_fbo.c
src/mesa/main/mtypes.h