bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji

Browse Source 
Conflicts:
	Marlin/example_configurations/delta/generic/Configuration.h
	Marlin/example_configurations/delta/kossel_mini/Configuration.h
	Marlin/language.h

Conflicts solved
This commit is contained in:
AnHardt
2015-03-24 16:59:15 +01:00
parent 08856d9615 512a0056a9
commit 9d589cbb2a
42 changed files with 2597 additions and 5410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/language.h
View File

@ -202,7 +202,6 @@
// LCD Menu Messages
#if !(defined( DISPLAY_CHARSET_HD44780_JAPAN ) || defined( DISPLAY_CHARSET_HD44780_WESTERN ) || defined( DISPLAY_CHARSET_HD44780_CYRILLIC ))
#define DISPLAY_CHARSET_HD44780_JAPAN
#endif