chiark / gitweb /
and changed ultipanel to have the mm/sec and not mm/min
authorBernhard Kubicek <kubicek@gmx.at>
Tue, 15 Nov 2011 21:50:43 +0000 (22:50 +0100)
committerBernhard Kubicek <kubicek@gmx.at>
Tue, 15 Nov 2011 21:50:43 +0000 (22:50 +0100)
commita9c7da06e398101517acc5b7a07e8dcb544df294
tree735c4bcff857d02112c4440500ded1e27059a8a3
parent02b9eceead9903beb9e1cf7d48f05fc2de8a8e8a
and changed ultipanel to have the mm/sec and not mm/min
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

Conflicts:
Marlin/Marlin.pde
Marlin/ultralcd.h
Marlin/Configuration.h
Marlin/Marlin.pde
Marlin/planner.cpp
Marlin/planner.h
Marlin/stepper.cpp
Marlin/temperature.cpp
Marlin/thermistortables.h
Marlin/ultralcd.h
Marlin/ultralcd.pde