chiark / gitweb /
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
authorDaid <daid303@gmail.com>
Sat, 19 May 2012 15:38:46 +0000 (17:38 +0200)
committerDaid <daid303@gmail.com>
Sat, 19 May 2012 15:38:46 +0000 (17:38 +0200)
commit7244aa7eb72d7eb6e2b01482e6e41884c249b479
treea3f6cd201755ca9f93e59a06f8553061359a92fd
parent279d00da9f363c3868609e89f1eee4d592732355
parente31bef31ad4ce8f97b892ccccec4947c8fc372d4
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Marlin/Configuration.h
Marlin/planner.cpp
Marlin/ultralcd.pde