9 Commits (e8c92e0a953541ef0a68a79818ad52e3e2c633fa)

Author SHA1 Message Date
Christian Thalhammer d309565b56 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
13 years ago
Erik van der Zalm 9173a5713b Teensylu support.
13 years ago
Christian Thalhammer 59cc5f889e - added support for ATMega1284P
13 years ago
Erik van der Zalm e017228569 Merged multiple extruder support.
13 years ago
Denis B 4fd75dc813 Working version of multiple extruders (up to 3)
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
Erik van der Zalm 750f6c33e3 first commit
13 years ago