Merge branch 'edge' into multitool
authorLogxen <logxen@hotmail.com>
Wed, 23 Apr 2014 14:10:01 +0000 (07:10 -0700)
committerLogxen <logxen@hotmail.com>
Wed, 23 Apr 2014 14:10:01 +0000 (07:10 -0700)
commit6a301bc9631135167f56f9cf9ee6d80e25abc56a
tree293d9bf4b3e05efbd013a1837d4db327111577c3
parentae65c448af4af7832c890c7ef2518e3bbd37feba
parent3082c235f03c323607786cbee1a3aecffb74b30b
Merge branch 'edge' into multitool

Conflicts:
ConfigSamples/Smoothieboard/config
src/libs/Kernel.h
src/modules/tools/extruder/Extruder.h
src/modules/tools/extruder/ExtruderMaker.cpp
ConfigSamples/Smoothieboard/config
src/libs/Kernel.cpp
src/libs/Kernel.h
src/modules/communication/GcodeDispatch.cpp
src/modules/robot/Robot.cpp
src/modules/tools/extruder/Extruder.cpp
src/modules/tools/extruder/Extruder.h