Merge branch 'edge' into extruderfix
authorArthur Wolf <wolf.arthur@gmail.com>
Fri, 15 Mar 2013 23:01:21 +0000 (00:01 +0100)
committerArthur Wolf <wolf.arthur@gmail.com>
Fri, 15 Mar 2013 23:01:21 +0000 (00:01 +0100)
commit7c21d84a4591cadea19f5b30f8affb78f359c53c
tree58a6dde25f3b783c11c4be0526938db378177a84
parenta4b47b502b2f25f65c98c43ba6df4d9622cd18c6
parent0bb7eba17db43bdb55c942335648ddd1da278f70
Merge branch 'edge' into extruderfix
src/libs/SlowTicker.cpp
src/modules/tools/temperaturecontrol/TemperatureControl.cpp