54 Commits (153220043537c603abab6ec2a66ce2c265bda330)

Author	SHA1	Message	Date
Bernhard Kubicek	8bcdb9f5f0	this is not working. Do you maybe know why?	13 years ago
Bernhard Kubicek	40e8081623	changed end of line to windows, which seems to be the majority of developers main platform.	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