You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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.
10 years ago
..
Logo added two black/white versions of the Marlin Logo for the LCD 10 years ago
BedLeveling.md X and Y must be Integers not Float! 10 years ago
COPYING.md moved licence to Documentation (its linked from the frontpage) to get a cleaner top level dir 10 years ago
Compilation.md updated compilation/configuring instructions 10 years ago
Contributing.md splitted huge README.md in several sections and moved them to the 10 years ago
Features.md reformatting 10 years ago
FilamentSensor.md splitted huge README.md in several sections and moved them to the 10 years ago
GCodes.md Update Documentation related to M204 10 years ago
LCD Menu Tree.pdf moved/renamed documentation stuff to top-level directory 10 years ago
LCDLanguageFont.md Argh! Did not hit save 10 years ago
Menu Plans.xlsx moved/renamed documentation stuff to top-level directory 10 years ago
RampsServoPower.md adding back notes on servo power 10 years ago
changelog.md initial empty change log 10 years ago