Merge remote-tracking branch 'upstream/edge' into feature/kill-button
authorJim Morris <morris@wolfman.com>
Mon, 3 Nov 2014 06:21:25 +0000 (22:21 -0800)
committerJim Morris <morris@wolfman.com>
Mon, 3 Nov 2014 06:21:25 +0000 (22:21 -0800)
commita5bf7be70e6e4cdb80f3aac61d830ad36eda2c9b
treef6beae6485df9e26f52edf409d3529e50619e2ea
parent7a3c98dbb37fa4e704de25bd0bdc8e783368ee94
parentb7ff723c5f25e9bae6144ec037bb785df16aa64b
Merge remote-tracking branch 'upstream/edge' into feature/kill-button

Conflicts:
ConfigSamples/Smoothieboard/config
ConfigSamples/Smoothieboard/config
src/modules/communication/GcodeDispatch.cpp