58 Commits (f0aee4101a21ed2607e6e2d43622252f78b42818)

Author	SHA1	Message	Date
Erik van der Zalm	04d3b5537f	Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 ... Conflicts: Marlin/Configuration.h Marlin/EEPROMwrite.h Marlin/Marlin.h Marlin/Marlin.pde Marlin/temperature.cpp Marlin/temperature.h Marlin/thermistortables.h	14 years ago
Erik van der Zalm	d15f01e1b4	Temperature changes	14 years ago
Bernhard Kubicek	b9ea0651ec	Revert "this is not working. Do you maybe know why?" ... This reverts commit 8bcdb9f5f0.	14 years ago
Bernhard Kubicek	8bcdb9f5f0	this is not working. Do you maybe know why?	14 years ago
Bernhard Kubicek	00674af3a8	merge from the branch bkubicek/Marlin/zalmmerge	14 years ago
Erik van der Zalm	094afe7c10	Merged Marlin, Marlin non gen6 and Ultimaker changes	14 years ago
Erik van der Zalm	8e017b81ab	Sync with non-gen6 version	14 years ago
Erik van der Zalm	750f6c33e3	first commit	14 years ago