Merge pull request #686 from thinkl33t/edge

author Arthur Wolf <wolf.arthur@gmail.com>

Sun, 23 Aug 2015 21:44:49 +0000 (23:44 +0200)

committer Arthur Wolf <wolf.arthur@gmail.com>

Sun, 23 Aug 2015 21:44:49 +0000 (23:44 +0200)
author Arthur Wolf <wolf.arthur@gmail.com>
Sun, 23 Aug 2015 21:44:49 +0000 (23:44 +0200)
committer Arthur Wolf <wolf.arthur@gmail.com>
Sun, 23 Aug 2015 21:44:49 +0000 (23:44 +0200)
diff --cc ConfigSamples/AzteegX5Mini.delta/config
Simple merge
diff --cc ConfigSamples/Smoothieboard/config
Simple merge
author	Arthur Wolf <wolf.arthur@gmail.com>
	Sun, 23 Aug 2015 21:44:49 +0000 (23:44 +0200)
committer	Arthur Wolf <wolf.arthur@gmail.com>
	Sun, 23 Aug 2015 21:44:49 +0000 (23:44 +0200)
		1	2
ConfigSamples/AzteegX5Mini.delta/config	patch \|	diff1 \|	diff2 \|	blob \| history
ConfigSamples/Smoothieboard/config	patch \|	diff1 \|	diff2 \|	blob \| history