chiark / gitweb /
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
authorBernhard Kubicek <kubicek@gmx.at>
Tue, 15 Nov 2011 21:53:04 +0000 (22:53 +0100)
committerBernhard Kubicek <kubicek@gmx.at>
Tue, 15 Nov 2011 21:53:04 +0000 (22:53 +0100)
commit46f80e82d947dcb928abdfe96ee1e2f48ea82de5
treec6b76d550940a810f0ba86564a94fb52f6b7c708
parenta9c7da06e398101517acc5b7a07e8dcb544df294
parent805d37f77b25fba70c05518cda4edd1c349b7f04
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

Conflicts:
Marlin/ultralcd.h
Marlin/Configuration.h