Merge branch 'stepper' of github.com:arthurwolf/Smoothie into stepper
authorArthur Wolf <wolf.arthur@gmail.com>
Fri, 2 Nov 2012 17:25:46 +0000 (18:25 +0100)
committerArthur Wolf <wolf.arthur@gmail.com>
Fri, 2 Nov 2012 17:25:46 +0000 (18:25 +0100)
1  2 
src/modules/robot/Stepper.cpp
src/modules/tools/temperaturecontrol/TemperatureControl.cpp

Simple merge