3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-27 22:08:02 +00:00
Code Issues Releases Wiki Activity
eff6a2bd2e
MarlinFirmware/Marlin/example_configurations
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
..
delta Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji 2015-03-19 12:35:43 +01:00
Felix Move TOPO_ORIGIN define to Configuration.h 2015-03-15 15:49:36 -07:00
Hephestos Merge branch 'Development' into delta_auto_bed_level 2015-03-16 08:24:26 +02:00
K8200 Merge branch 'Development' into delta_auto_bed_level 2015-03-16 08:24:26 +02:00
makibox Merge branch 'Development' into delta_auto_bed_level 2015-03-16 08:24:26 +02:00
SCARA Merge branch 'Development' into delta_auto_bed_level 2015-03-16 08:24:26 +02:00
tvrrug/Round2 Merge branch 'Development' into delta_auto_bed_level 2015-03-16 08:24:26 +02:00
WITBOX Merge branch 'Development' into delta_auto_bed_level 2015-03-16 08:24:26 +02:00