Merge branch 'Development' into eeprom_in_gcode

Latest upstream commits
2015-04-27 21:47:47 -07:00
parent ff178d8cf7 28aef684b4
commit 0f687b5dda
35 changed files with 841 additions and 161 deletions
--- a/Marlin/language.h
+++ b/Marlin/language.h
@ -30,6 +30,7 @@
 // eu       Basque-Euskera
 // kana     Japanese
 // kana_utf Japanese
+// cn       Chinese

 #ifndef LANGUAGE_INCLUDE
  // pick your language from the list above