Marlin_Firmware

History

AnHardt b4b19a6cbd Merge https://github.com/MarlinFirmware/Marlin into Bulgarian

Conflicts:
	Marlin/Configuration.h
	Marlin/configurator/config/Configuration.h
	Marlin/example_configurations/Felix/Configuration.h
	Marlin/example_configurations/Felix/Configuration_DUAL.h
	Marlin/example_configurations/Hephestos/Configuration.h
	Marlin/example_configurations/K8200/Configuration.h
	Marlin/example_configurations/SCARA/Configuration.h
	Marlin/example_configurations/WITBOX/Configuration.h
	Marlin/example_configurations/delta/generic/Configuration.h
	Marlin/example_configurations/delta/kossel_mini/Configuration.h
	Marlin/example_configurations/makibox/Configuration.h
	Marlin/example_configurations/tvrrug/Round2/Configuration.h

Conflicts with my Chinese implementation resolved.

2015-04-28 09:24:32 +02:00

Logo

A logo for the Marlin wiki

2015-03-23 18:25:31 -07:00

BedLeveling.md

X and Y must be Integers not Float!

2015-02-10 09:00:48 +01:00

changelog.md

small text correction

2015-03-23 21:55:03 -07:00

Compilation.md

Update Compilation.md