Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders

Conflicts: Marlin/temperature.cpp
2015-01-24 13:41:15 +01:00
parent 986e723eeb 0ebf896070
commit 3d4ee6c868
3 changed files with 39 additions and 20 deletions
--- a/Marlin/ultralcd.h
+++ b/Marlin/ultralcd.h
@@ -46,9 +46,9 @@
  
  extern bool cancel_heatup;
  
-#ifdef FILAMENT_LCD_DISPLAY
-  extern unsigned long message_millis;
-#endif
+  #ifdef FILAMENT_LCD_DISPLAY
+        extern unsigned long message_millis;
+  #endif

  void lcd_buzz(long duration,uint16_t freq);
  bool lcd_clicked();