4 commits

Author	SHA1	Message	Date
Bernhard Kubicek	1d171e9e52	reformating and some minor bugs/things found on the way.	2011-11-06 19:23:08 +01:00
Bernhard Kubicek	40e8081623	changed end of line to windows, which seems to be the majority of developers main platform.	2011-11-05 14:19:57 +01:00
Bernhard Kubicek	00674af3a8	merge from the branch bkubicek/Marlin/zalmmerge	2011-11-05 14:13:20 +01:00
Erik van der Zalm	094afe7c10	Merged Marlin, Marlin non gen6 and Ultimaker changes	2011-11-04 18:02:56 +01:00