7 Commits (0b43761c3af221bd67bae26ac546846ed15b8ee0)

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	40e8081623	changed end of line to windows, which seems to be the majority of developers main platform.	14 years ago
Bernhard Kubicek	00674af3a8	merge from the branch bkubicek/Marlin/zalmmerge	14 years ago
Erik van der Zalm	bf879ceaa9	Added thermistor tables	14 years ago
Erik van der Zalm	094afe7c10	Merged Marlin, Marlin non gen6 and Ultimaker changes	14 years ago
Erik van der Zalm	750f6c33e3	first commit	14 years ago