From: Ben Skeggs <skeggsb@gmail.com>
Date: Wed, 12 Dec 2007 02:11:19 +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=58915980127ab4e57b6b40a8c42f44be4a12aeae;p=mesa.git

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

Conflicts:

	src/mesa/pipe/Makefile
---

58915980127ab4e57b6b40a8c42f44be4a12aeae
diff --cc src/mesa/pipe/Makefile
index e4b72e49409,c0345a9cb54..fbd36d95f7a
--- a/src/mesa/pipe/Makefile
+++ b/src/mesa/pipe/Makefile
@@@ -6,7 -6,7 +6,8 @@@ ifeq ($(CONFIG_NAME), linux-cell
  CELL_DIR = cell
  endif
  
- SUBDIRS = softpipe i915simple nv40 nv50 failover pipebuffer $(CELL_DIR)
 -SUBDIRS = softpipe i915simple i965simple failover pipebuffer $(CELL_DIR)
++SUBDIRS = softpipe i915simple i965simple nv40 nv50 failover \
++	  pipebuffer $(CELL_DIR)
  
  
  default: subdirs