chiark / gitweb /
Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 27 May 2014 21:23:49 +0000 (22:23 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 27 May 2014 21:23:49 +0000 (22:23 +0100)
commitc88984757c32927d4cab9adaec78a7bec75825b5
tree41dca58ebda1ecfaf88c8af339ca0da08e97f845
parent460b0d944eaf5dd53b58d3edf3d855ed894e65e0
parent8622f62da0556fe4042b37ec9d9f94f28a03053c
Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play

Conflicts:
brompton-computer-guard.scad

Ditch old version in favour of new simple version