Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1

2013-05-18 21:59:39 +10:00
parent 015d0594b0 64360164ad
commit dfa549f268
13 changed files with 1210 additions and 415 deletions
--- a/Marlin/ultralcd.h
+++ b/Marlin/ultralcd.h
@@ -35,7 +35,6 @@
  extern int absPreheatFanSpeed;
    
  void lcd_buzz(long duration,uint16_t freq);
-
  bool lcd_clicked();

 #else //no lcd