From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 27 May 2014 21:23:49 +0000 (+0100)
Subject: Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play
X-Git-Tag: filamentspool-v2-release~373
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c88984757c32927d4cab9adaec78a7bec75825b5;hp=-c;p=reprap-play.git

Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play

Conflicts:
	brompton-computer-guard.scad

Ditch old version in favour of new simple version
---

c88984757c32927d4cab9adaec78a7bec75825b5