Merge branch 'master' of git+ssh://michal@git.freedesktop.org/git/mesa/mesa into...

author michal <michal@michal-laptop.(none)>

Fri, 27 Jul 2007 08:05:40 +0000 (10:05 +0200)

committer michal <michal@michal-laptop.(none)>

Fri, 27 Jul 2007 08:05:40 +0000 (10:05 +0200)
author michal <michal@michal-laptop.(none)>
Fri, 27 Jul 2007 08:05:40 +0000 (10:05 +0200)
committer michal <michal@michal-laptop.(none)>
Fri, 27 Jul 2007 08:05:40 +0000 (10:05 +0200)
diff --cc src/mesa/drivers/dri/i915tex/intel_fbo.c
Simple merge
diff --cc src/mesa/main/mtypes.h
Simple merge
author	michal <michal@michal-laptop.(none)>
	Fri, 27 Jul 2007 08:05:40 +0000 (10:05 +0200)
committer	michal <michal@michal-laptop.(none)>
	Fri, 27 Jul 2007 08:05:40 +0000 (10:05 +0200)
		1	2
src/mesa/drivers/dri/i915tex/intel_fbo.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mesa/main/mtypes.h	patch \|	diff1 \|	diff2 \|	blob \| history