Marlin/Documentation
AnHardt 9d589cbb2a Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji
Conflicts:
	Marlin/example_configurations/delta/generic/Configuration.h
	Marlin/example_configurations/delta/kossel_mini/Configuration.h
	Marlin/language.h

Conflicts solved
2015-03-24 16:59:15 +01: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 updated compilation/configuring instructions 2015-01-08 18:58:08 +01: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 Update Documentation related to M204 2015-03-18 11:09:10 -03:00
LCD Menu Tree.pdf moved/renamed documentation stuff to top-level directory 2015-01-07 15:33:50 +01:00
LCDLanguageFont.md Argh! Did not hit save 2015-03-13 15:26:01 +01:00
Menu Plans.xlsx moved/renamed documentation stuff to top-level directory 2015-01-07 15:33:50 +01:00
RampsServoPower.md adding back notes on servo power 2015-01-11 14:18:38 +01:00