chiark / gitweb /
Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 1 Jan 2017 21:33:03 +0000 (21:33 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 1 Jan 2017 21:33:03 +0000 (21:33 +0000)
Conflicts:
Makefile

1  2 
Makefile

diff --cc Makefile
+++ b/Makefile
@@@ -30,7 -30,7 +30,7 @@@ CONFIG=$(PLAY)/slic3r-config.in
  FILAMENTSPOOL_AUTOS = filamentspool filamentspool-lt filamentspool-sm
  FILAMENTSPOOL_AUTOS += filamentspool-storarm3
  
- USING_AUTOS ?= $(FILAMENTSPOOL_AUTOS) xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter pattress-boxes-3-cover bike-lipo-box earring-stand bike-stalk-led-mount
 -USING_AUTOS ?= $(FILAMENTSPOOL_AUTOS) xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter pattress-boxes-3-cover bike-lipo-box earring-stand sewing-table
++USING_AUTOS ?= $(FILAMENTSPOOL_AUTOS) xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter pattress-boxes-3-cover bike-lipo-box earring-stand bike-stalk-led-mount sewing-table
  
  AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))