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 e917477fec Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
Conflicts:
	Marlin/dogm_lcd_implementation.h
	Marlin/fonts/make_fonts.bat

Claerd conflicts with my own #1621. (His was easy. :-) )

corrected typo in fonts/README.fonts

Applied changes to the new delta-configurations
 and deletet there some extra whitespace at the line-endings.
10 years ago
..
Felix Move TOPO_ORIGIN define to Configuration.h 10 years ago
Hephestos Merge branch 'Development' into delta_auto_bed_level 10 years ago
K8200 Merge branch 'Development' into delta_auto_bed_level 10 years ago
SCARA Merge branch 'Development' into delta_auto_bed_level 10 years ago
WITBOX Merge branch 'Development' into delta_auto_bed_level 10 years ago
delta Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 10 years ago
makibox Merge branch 'Development' into delta_auto_bed_level 10 years ago
tvrrug/Round2 Merge branch 'Development' into delta_auto_bed_level 10 years ago