chiark / gitweb /
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
authorBernhard Kubicek <kubicek@gmx.at>
Sun, 6 Nov 2011 18:49:04 +0000 (19:49 +0100)
committerBernhard Kubicek <kubicek@gmx.at>
Sun, 6 Nov 2011 18:49:04 +0000 (19:49 +0100)
commit163efdf1c764eb0be84aadd5c3d715a4d46df807
treee6aebd02165edd999ac4c536cb1cb154e0162438
parent87aaf0f70a22686d2107efa01cfa19bba542c386
parent5cf349a24a610d7223c5bc88193c07c713818028
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Marlin/Configuration.h
Marlin/Marlin.pde