marlin-lulzbot-laser

Commit Graph

Author	SHA1	Message	Date
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

Author

SHA1

Message

Date

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.

1 Commits (fc3c76fc1641370ee76a564299592e283cbcd0c0)