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)
commit315be68ee9631d2bfd699ecb05e391715d774668
treed1bd302bcd319853336044e524bda06bb7109159
parentdb4531250ea0e0bcf81808ffa908f26e93c82e5c
parent40134677ed15f12fd5cc3d2f7641d11ac20ad0d5
Merge branch 'stepper' of github.com:arthurwolf/Smoothie into stepper
src/modules/robot/Stepper.cpp
src/modules/tools/temperaturecontrol/TemperatureControl.cpp