Merge remote-tracking branch 'upstream/edge' into feature/add-grbl-queries
authorJim Morris <morris@wolfman.com>
Tue, 2 Feb 2016 06:14:24 +0000 (22:14 -0800)
committerJim Morris <morris@wolfman.com>
Tue, 2 Feb 2016 06:14:24 +0000 (22:14 -0800)
commit162f04e800747d07d1c86844a37c345e32416ccc
tree6db76092efe86018f155e1717d54df2f81e07fa6
parentd12208135b94469f008a591dc143d3a00516597d
parentbe0230e2c3ded025e72f7d6ae661bf213984a46b
Merge remote-tracking branch 'upstream/edge' into feature/add-grbl-queries

Conflicts:
src/modules/tools/endstops/Endstops.cpp
src/modules/robot/Robot.cpp
src/modules/tools/endstops/Endstops.cpp
src/modules/tools/endstops/Endstops.h