Firmware/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 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 2015-04-15 16:35:02 +02:00
Contributing.md splitted huge README.md in several sections and moved them to the 2015-01-08 18:55:32 +01:00
COPYING.md moved licence to Documentation (its linked from the frontpage) to get a cleaner top level dir 2015-01-08 18:59:40 +01:00
Features.md reformatting 2015-01-08 19:38:52 +01:00
FilamentSensor.md splitted huge README.md in several sections and moved them to the 2015-01-08 18:55:32 +01:00
GCodes.md Clean up M85 in GCodes.md 2015-04-10 16:04:32 -07:00
LCD Menu Tree.pdf moved/renamed documentation stuff to top-level directory 2015-01-07 15:33:50 +01:00
LCDLanguageFont.md Merge https://github.com/MarlinFirmware/Marlin into Bulgarian 2015-04-28 09:24:32 +02:00
Menu Plans.xlsx moved/renamed documentation stuff to top-level directory 2015-01-07 15:33:50 +01:00
MeshBedLeveling.md Added #error + mention not to enable ABL and Mesh at the same time 2015-04-06 19:38:59 +02:00
RampsServoPower.md adding back notes on servo power 2015-01-11 14:18:38 +01:00