marlin

Árbol: 2afb7bd4cf

Autor	SHA1	Mensaje	Fecha
Bernhard Kubicek	b9ea0651ec	Revert "this is not working. Do you maybe know why?" This reverts commit 8bcdb9f5f0.	hace 13 años
Bernhard Kubicek	8bcdb9f5f0	this is not working. Do you maybe know why?	hace 13 años
Bernhard Kubicek	40e8081623	changed end of line to windows, which seems to be the majority of developers main platform.	hace 13 años
Bernhard Kubicek	00674af3a8	merge from the branch bkubicek/Marlin/zalmmerge	hace 13 años
Erik van der Zalm	094afe7c10	Merged Marlin, Marlin non gen6 and Ultimaker changes	hace 13 años