chiark / gitweb /
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
authorErik van der Zalm <erik@vdzalm.eu>
Sun, 4 Dec 2011 18:54:43 +0000 (19:54 +0100)
committerErik van der Zalm <erik@vdzalm.eu>
Sun, 4 Dec 2011 18:54:43 +0000 (19:54 +0100)
commit95a0b28acbf8ee93cf1cb06fd0c76ccd582712d4
tree79ce271c83b61ea88105c8265b959833d79d8819
parentaf22e9cd38c9684bd64cc7307137abe9efbba6d0
parent7714b98da74b0b84cb620474fd8e4cb19d15bfc0
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Marlin/Configuration.h
Marlin/planner.cpp
Marlin/stepper.cpp