Merge remote-tracking branch 'refs/remotes/prusa3d/MK2' into MK2

Browse Source

# Conflicts:
#	Firmware/language_all.cpp
#	Firmware/language_en.h

...

This commit is contained in:

3d-gussner 2017-05-20 11:13:35 +02:00

parent 8593eba864 d44b30bbc6

commit 202f2351f9

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