chiark / gitweb /
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)
commitc7ce99d495edcef4276951d4635ccd709f8a0f05
treee91a22b3a5c49d5a1a3f858b9a526969cd0ed3ed
parentb7fc14bc65a17defab639c67be8298fc0272e3a2
parente9bec9b6fef576762cef4f4001417ae5cb7bdff7
Merge pull request #172 from daid/Marlin_v1

Add M401 - Wait for user to press button on LCD (with optional timeout) minor fix in M115.
Marlin/Marlin.pde