You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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
10 years ago
..
Felix Merge branch 'Development' into planner_oh_planner 10 years ago
Hephestos Merge branch 'Development' into planner_oh_planner 10 years ago
K8200 Merge branch 'Development' into planner_oh_planner 10 years ago
SCARA Merge branch 'Development' into planner_oh_planner 10 years ago
WITBOX Merge branch 'Development' into planner_oh_planner 10 years ago
delta Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji 10 years ago
makibox Merge branch 'Development' into planner_oh_planner 10 years ago
tvrrug/Round2 Merge branch 'Development' into planner_oh_planner 10 years ago