Merge branch 'LanguageFix' of github.com:RobotCaleb/Marlin-Kossel_Clear into LanguageFix

Browse Source

Conflicts:
	Marlin/language.h

...

This commit is contained in:

Caleb Anderson 2014-12-29 10:48:56 -07:00

parent 236db44669 d254651146

commit 2309c9f43a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available