chiark / gitweb /
~ianmdlvl / marlin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7fc14b e9bec9b)
Merge pull request #172 from daid/Marlin_v1
authorBernhard Kubicek <kubicek@gmx.at>
Sat, 2 Jun 2012 10:44:03 +0000 (03:44 -0700)
committerBernhard Kubicek <kubicek@gmx.at>
Sat, 2 Jun 2012 10:44:03 +0000 (03:44 -0700)
Add M401 - Wait for user to press button on LCD (with optional timeout) minor fix in M115.

1  2 
Marlin/Marlin.pde patch | diff1 | diff2 | blob | history

diff --cc Marlin/Marlin.pde
Simple merge
Unnamed repository; edit this file 'description' to name the repository.