chiark / gitweb /
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
authorErik van der Zalm <erik@vdzalm.eu>
Mon, 14 Nov 2011 17:26:57 +0000 (18:26 +0100)
committerErik van der Zalm <erik@vdzalm.eu>
Mon, 14 Nov 2011 17:26:57 +0000 (18:26 +0100)
commitc00eefb8242cfaf3d16fd30f8a58f02cc9f885b2
tree2808f0dea16c40a6105c24c6a4c1e19fa75859f6
parent1d0452f10ce6d067836e483e3512c4099b4ca524
parentc57906b627bf7245578522ab50e9d35e9c6bc96b
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Marlin/Configuration.h
Marlin/Marlin.pde
Marlin/temperature.cpp