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

146e2cc1 · MagoKimbra · f427ffe0 · 18173e56 · 146e2cc1
Commit 146e2cc1 authored Jan 04, 2016 by MagoKimbra
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

pins.h MarlinKimbra/pins.h +1 -1

No files found.
--- a/MarlinKimbra/pins.h
+++ b/MarlinKimbra/pins.h
@@ -3789,7 +3789,7 @@
 #if MB(MINITRONICS)
  #define KNOWN_BOARD 1

-  #ifndef __AVR_ATmega1281__
+  #ifndef __AVR_ATmega1280__
    #error Oops! Make sure you have 'Minitronics ' selected from the 'Tools -> Boards' menu.
  #endif