Revert "Revert "Merge branch 'fix/Queue_scan_consolidation' into edge""
authorMichael Moon <triffid.hunter@gmail.com>
Fri, 27 Dec 2013 01:43:23 +0000 (12:43 +1100)
committerMichael Moon <triffid.hunter@gmail.com>
Fri, 27 Dec 2013 01:43:23 +0000 (12:43 +1100)
commitc3714d05954eee886f97fa3e53edcdb951bf1b91
treee46c0c3af4e2ac5e4549e91305505f5f282fd053
parente918c030e3ced39ce7d6f8d7a66d1ce8bb78e7d9
Revert "Revert "Merge branch 'fix/Queue_scan_consolidation' into edge""

This reverts commit e918c030e3ced39ce7d6f8d7a66d1ce8bb78e7d9.
src/modules/robot/Block.cpp
src/modules/robot/Block.h
src/modules/robot/Planner.cpp
src/modules/robot/Planner.h