merging

2011-12-12 20:35:46 +01:00
parent e017228569 3320a5b37d
commit 84d9cf7339
12 changed files with 358 additions and 203 deletions
--- a/Marlin/stepper.h
+++ b/Marlin/stepper.h
@ -67,5 +67,5 @@ void finishAndDisableSteppers();

 extern block_t *current_block;  // A pointer to the block currently being traced

-
+void quickStop();
 #endif