2 Commits

Author	SHA1	Message	Date
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