AnHardt 20f909567a Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji ...

Conflicts:
	README.md
Solved

2015-03-26 10:05:00 +01:00

..

Configuration_adv.h

Move LCD items to Conditionals.h

2015-03-21 15:24:57 -07:00

Configuration.h

Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji

2015-03-26 10:05:00 +01:00