chiark
/
gitweb
/
~ianmdlvl
/
reprap-play.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
460b0d9
8622f62
)
Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Tue, 27 May 2014 21:23:49 +0000
(22:23 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Tue, 27 May 2014 21:23:49 +0000
(22:23 +0100)
Conflicts:
brompton-computer-guard.scad
Ditch old version in favour of new simple version
Trivial merge
~ianmdlvl / reprap-play.git / commitdiff