3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases 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
commit 9d589cbb2a
42 changed files with 2597 additions and 5410 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Marlin/language_en.h
View file

@ -105,6 +105,9 @@
#ifndef MSG_MOVE_AXIS
#define MSG_MOVE_AXIS "Move axis"
#endif
#ifndef MSG_LEVEL_BED
#define MSG_LEVEL_BED "Level bed"
#endif
#ifndef MSG_MOVE_X
#define MSG_MOVE_X "Move X"
#endif