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

9886264b · MagoKimbra · 6a2455c5 · 8575259d · 9886264b · 9886264b
Commit 9886264b authored Jan 12, 2016 by MagoKimbra
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Configuration_Store.cpp MarlinKimbra/Configuration_Store.cpp +1 -1

nextion_lcd.cpp MarlinKimbra/module/nextion_lcd.cpp +1 -1

No files found.
--- a/MarlinKimbra/Configuration_Store.cpp
+++ b/MarlinKimbra/Configuration_Store.cpp
@@ -8,7 +8,7 @@
 #include "module/stepper.h"
 #include "module/temperature.h"
 #include "module/ultralcd.h"
-#include "configuration_store.h"
+#include "Configuration_Store.h"

 #if ENABLED(SDSUPPORT)
  #include "module/cardreader.h"

--- a/MarlinKimbra/module/nextion_lcd.cpp
+++ b/MarlinKimbra/module/nextion_lcd.cpp
 #include "../base.h"
 #include "../Marlin_main.h"
-#include "../configuration_store.h"
+#include "../Configuration_Store.h"

 #if ENABLED(NEXTION)
  #include "cardreader.h"