From: Ian Jackson Date: Sun, 1 Jan 2017 21:33:03 +0000 (+0000) Subject: Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=commitdiff_plain;h=378396c125ba134a2fa950bcf0c25b89a40ecb28 Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play Conflicts: Makefile --- 378396c125ba134a2fa950bcf0c25b89a40ecb28 diff --cc Makefile index 5517507,306f4f4..688c7ce --- a/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))