AnHardt 9d589cbb2a Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji ... Conflicts: Marlin/example_configurations/delta/generic/Configuration.h Marlin/example_configurations/delta/kossel_mini/Configuration.h Marlin/language.h Conflicts solved		2015-03-24 16:59:15 +01:00
..
Configuration.h	Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji	2015-03-24 16:59:15 +01:00
Configuration_adv.h	Move LCD items to Conditionals.h	2015-03-21 15:24:57 -07:00