projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e282d22 b2ad30d)
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Wed, 12 Dec 2007 02:11:19 +0000 (13:11 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Wed, 12 Dec 2007 02:11:19 +0000 (13:11 +1100)
Conflicts:

src/mesa/pipe/Makefile

1  2 
src/mesa/pipe/Makefile patch | diff1 | diff2 | blob | history

diff --cc src/mesa/pipe/Makefile
index e4b72e49409e002437b0e8cbd6ea86af5ec93473,c0345a9cb54feead7510fe58c13b383c5c6b534d..fbd36d95f7a4f67faedeffad3eeed70297b73d27
--- 1/src/mesa/pipe/Makefile
--- 2/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