4 Commits (2afb7bd4cfa130d57dcbca657fa9a81eecbc7a15)

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	13 years ago
Bernhard Kubicek	b9ea0651ec	Revert "this is not working. Do you maybe know why?" ... This reverts commit 8bcdb9f5f0.	13 years ago
Bernhard Kubicek	8bcdb9f5f0	this is not working. Do you maybe know why?	13 years ago
Bernhard Kubicek	00674af3a8	merge from the branch bkubicek/Marlin/zalmmerge	13 years ago