Marlin/Documentation
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
BedLeveling.md
changelog.md
Compilation.md Update Compilation.md 2015-04-15 16:35:02 +02:00
Contributing.md
COPYING.md
Features.md
FilamentSensor.md
GCodes.md Clean up M85 in GCodes.md 2015-04-10 16:04:32 -07:00
LCD Menu Tree.pdf
LCDLanguageFont.md Merge https://github.com/MarlinFirmware/Marlin into Bulgarian 2015-04-28 09:24:32 +02:00
Menu Plans.xlsx
MeshBedLeveling.md
RampsServoPower.md