Merge remote-tracking branch 'refs/remotes/origin/master' into dev

200bcf80 · MagoKimbra · 5c644442 · e16d723c · 200bcf80 · 200bcf80
Commit 200bcf80 authored Jan 12, 2016 by MagoKimbra
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 144 additions and 136 deletions

Marlin_main.cpp MarlinKimbra/Marlin_main.cpp +1 -1

language.h MarlinKimbra/language/language.h +143 -135

No files found.
--- a/MarlinKimbra/Marlin_main.cpp
+++ b/MarlinKimbra/Marlin_main.cpp
@@ -834,7 +834,7 @@ void setup() {
  if (mcu & 32) ECHO_EM(SERIAL_SOFTWARE_RESET);
  MCUSR = 0;

-  ECHO_LM(DB, MSG_MARLIN " " BUILD_VERSION);
+  ECHO_LM(DB, BUILD_VERSION);

  #if ENABLED(STRING_DISTRIBUTION_DATE) && ENABLED(STRING_CONFIG_H_AUTHOR)
    ECHO_LM(DB, SERIAL_CONFIGURATION_VER STRING_DISTRIBUTION_DATE SERIAL_AUTHOR STRING_CONFIG_H_AUTHOR);

--- a/MarlinKimbra/language/language.h
+++ b/MarlinKimbra/language/language.h