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)
commit378396c125ba134a2fa950bcf0c25b89a40ecb28
tree5ae789c1682c9fa4e444a59f47171f1cf5b566f8
parent5a08602415dde99a70d3874ca4f6cadc09cbae3d
parent50e5e565dff5228a703ab78c234022ab7186fcd1
Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play

Conflicts:
Makefile
Makefile