Firmware2/Marlin/example_configurations/delta/generic
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
..
Configuration_adv.h Merge branch 'Development' into delta_auto_bed_level 2015-03-16 08:24:26 +02:00
Configuration.h Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 2015-03-19 12:35:43 +01:00