5 Commits (46f80e82d947dcb928abdfe96ee1e2f48ea82de5)

Author	SHA1	Message	Date
Bernhard Kubicek	a9c7da06e3	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	13 years ago
Bernhard Kubicek	36958ee305	minor changes and first not-well working version of autotemp	13 years ago
Bernhard Kubicek	1d171e9e52	reformating and some minor bugs/things found on the way.	13 years ago
Bernhard Kubicek	00674af3a8	merge from the branch bkubicek/Marlin/zalmmerge	13 years ago
Erik van der Zalm	094afe7c10	Merged Marlin, Marlin non gen6 and Ultimaker changes	13 years ago