From: Bernhard Kubicek <kubicek@gmx.at>
Date: Sun, 6 Nov 2011 18:49:04 +0000 (+0100)
Subject: Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
X-Git-Tag: iwj-success-2012-07-29~251
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=163efdf1c764eb0be84aadd5c3d715a4d46df807;p=marlin.git

Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
---

163efdf1c764eb0be84aadd5c3d715a4d46df807
diff --cc Marlin/Configuration.h
index 722cb96,1c77733..d417d41
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@@ -58,14 -59,13 +59,13 @@@ const bool ENDSTOPS_INVERTING = true; /
  
  // #define ULTRA_LCD  //any lcd 
  
- #define ULTIPANEL
  #define ULTIPANEL
  #ifdef ULTIPANEL
 - //#define NEWPANEL  //enable this if you have a click-encoder panel
 - #define SDSUPPORT
 - #define ULTRA_LCD
 - #define LCD_WIDTH 20
 -#define LCD_HEIGHT 4
 +  //#define NEWPANEL  //enable this if you have a click-encoder panel
 +  #define SDSUPPORT
 +  #define ULTRA_LCD
 +  #define LCD_WIDTH 20
 +  #define LCD_HEIGHT 4
  #else //no panel but just lcd 
    #ifdef ULTRA_LCD
      #define LCD_WIDTH 16