From: Ben Skeggs <skeggsb@gmail.com>
Date: Mon, 10 Dec 2007 01:06:59 +0000 (+1100)
Subject: Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5c1a5b504705214fd5e90b33bb3034e75f6b5994;p=mesa.git

Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1

Conflicts:

	src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
	src/mesa/pipe/Makefile
	src/mesa/pipe/draw/draw_vertex_fetch.c
	src/mesa/pipe/i915simple/i915_texture.c
	src/mesa/pipe/softpipe/sp_texture.c
	src/mesa/pipe/xlib/xm_winsys.c
	src/mesa/state_tracker/st_cb_fbo.c
---

5c1a5b504705214fd5e90b33bb3034e75f6b5994
diff --cc src/mesa/pipe/Makefile
index 5099b65885e,2bf7318d59a..e4b72e49409
--- a/src/mesa/pipe/Makefile
+++ b/src/mesa/pipe/Makefile
@@@ -7,7 -6,7 +6,7 @@@ ifeq ($(CONFIG_NAME), linux-cell
  CELL_DIR = cell
  endif
  
- SUBDIRS = softpipe i915simple nv40 nv50 failover $(CELL_DIR)
 -SUBDIRS = softpipe i915simple failover pipebuffer $(CELL_DIR)
++SUBDIRS = softpipe i915simple nv40 nv50 failover pipebuffer $(CELL_DIR)
  
  
  default: subdirs