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

6738304a · MagoKimbra · b4b87d3b · ebc16d83 · 6738304a
Commit 6738304a authored Dec 31, 2015 by MagoKimbra
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cardreader.cpp MarlinKimbra/cardreader.cpp +1 -1

No files found.
--- a/MarlinKimbra/cardreader.cpp
+++ b/MarlinKimbra/cardreader.cpp
@@ -11,7 +11,7 @@
 #include "stepper.h"
 #include "temperature.h"
 #include "ultralcd.h"
-#include "nextion_lcd.h"
+#include "nextion/nextion_lcd.h"
 #include "cardreader.h"

 CardReader::CardReader() {