chiark / gitweb /
Merge remote-tracking branch 'daid/Marlin_v1' into Test
authorErik van der Zalm <erik@vdzalm.eu>
Sun, 26 Feb 2012 15:10:59 +0000 (16:10 +0100)
committerErik van der Zalm <erik@vdzalm.eu>
Sun, 26 Feb 2012 15:10:59 +0000 (16:10 +0100)
commit4fbda5c3f5cc85f5d9d8d946f42fdd62380db7a2
treec7c71221315204ba53ddc77c6c00fe854611ca68
parentce714fe3068f9815d958d05169948eaf519f2cb3
parent73344e69c1cd361164aa67af9ab28344f17a1227
Merge remote-tracking branch 'daid/Marlin_v1' into Test
Marlin/Configuration.h
Marlin/temperature.cpp