3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-30 23:30:16 +00:00
Code Issues Releases Wiki Activity
eff6a2bd2e
MarlinFirmware/Marlin/example_configurations/delta
History
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.
2015-03-19 12:35:43 +01:00
..
generic Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 2015-03-19 12:35:43 +01:00
kossel_mini Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 2015-03-19 12:35:43 +01:00