and changed ultipanel to have the mm/sec and not mm/min

Browse Source

Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

Conflicts:
	Marlin/Marlin.pde
	Marlin/ultralcd.h

...

This commit is contained in:

Bernhard Kubicek

2011-11-15 22:50:43 +01:00

parent 02b9eceead

commit a9c7da06e3

9 changed files with 2284 additions and 2125 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1157

Marlin/temperature.cpp

File diff suppressed because it is too large Load Diff