Merge branch 'edge' into multitool

author Logxen <logxen@hotmail.com>

Sun, 18 May 2014 00:45:23 +0000 (17:45 -0700)

committer Logxen <logxen@hotmail.com>

Sun, 18 May 2014 00:45:23 +0000 (17:45 -0700)
author Logxen <logxen@hotmail.com>
Sun, 18 May 2014 00:45:23 +0000 (17:45 -0700)
committer Logxen <logxen@hotmail.com>
Sun, 18 May 2014 00:45:23 +0000 (17:45 -0700)
diff --cc src/libs/Kernel.cpp
Simple merge
diff --cc src/modules/robot/Robot.cpp
Simple merge
diff --cc src/modules/tools/extruder/Extruder.cpp
Simple merge
author	Logxen <logxen@hotmail.com>
	Sun, 18 May 2014 00:45:23 +0000 (17:45 -0700)
committer	Logxen <logxen@hotmail.com>
	Sun, 18 May 2014 00:45:23 +0000 (17:45 -0700)
		1	2
src/libs/Kernel.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/modules/robot/Robot.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/modules/tools/extruder/Extruder.cpp	patch \|	diff1 \|	diff2 \|	blob \| history