3 commits

Author	SHA1	Message	Date
Bernhard Kubicek	00674af3a8	merge from the branch bkubicek/Marlin/zalmmerge	2011-11-05 14:13:20 +01:00
Erik van der Zalm	bf879ceaa9	Added thermistor tables	2011-11-04 22:51:14 +01:00
Erik van der Zalm	094afe7c10	Merged Marlin, Marlin non gen6 and Ultimaker changes	2011-11-04 18:02:56 +01:00