Merge branch 'edge' into extruderfix
authorArthur Wolf <wolf.arthur@gmail.com>
Sat, 2 Mar 2013 19:08:49 +0000 (20:08 +0100)
committerArthur Wolf <wolf.arthur@gmail.com>
Sat, 2 Mar 2013 19:08:49 +0000 (20:08 +0100)
commit74717fc2edcde3bfb9f1c09f943339d8fa221614
tree9beba1203c4e621e4ec40c1525124edab7158c2e
parent3c4f2dd821402a5652272b7a81fbed5507d5efd5
parent43659e9c214b7a81d1e01c0235047add94c8912b
Merge branch 'edge' into extruderfix
src/modules/tools/temperaturecontrol/TemperatureControl.cpp