Skip to content
Commit a9c7da06 authored by Bernhard Kubicek's avatar Bernhard Kubicek
Browse files

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

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

Conflicts:
	Marlin/Marlin.pde
	Marlin/ultralcd.h
parent 02b9ecee
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment