Merge remote-tracking branch 'upstream/master'

Author: tbowmo

libraries/LiquidCrystal/LCD.cpp

@@ -304,7 +304,7 @@ void LCD::createChar(uint8_t location, uint8_t charmap[])
 }
 
 #ifdef __AVR__
-void LCD::createChar(uint8_t location, const prog_uchar charmap[])
+void LCD::createChar(uint8_t location,  const unsigned char charmap[])
 {
    location &= 0x7;   // we only have 8 memory locations 0-7
 

libraries/LiquidCrystal/LCD.h

@@ -418,7 +418,7 @@ class LCD : public Print
     (0 to 7)
     @param      charmap[in] the bitmap array representing each row of the character.
     */
-   void createChar(uint8_t location, const prog_uchar charmap[]);
+   void createChar(uint8_t location,  const unsigned char charmap[]);
 #endif // __AVR__
 
    /*!