Tree: b1bb1c7989

Commit Graph

224 Commits (b1bb1c7989727e3707f4978100ebce443645f786)

Author	SHA1	Message	Date
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	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	094afe7c10	Merged Marlin, Marlin non gen6 and Ultimaker changes	14 years ago