diff options
| author | Kumar Abhishek <abhishek@kumar> | 2012-06-14 17:16:32 +0530 |
|---|---|---|
| committer | Kumar Abhishek <abhishek@kumar> | 2012-06-14 17:16:32 +0530 |
| commit | 04fdc1a2563342b142cf3d1fe7808fae286e27e0 (patch) | |
| tree | 0ca52ebb41f3251bc2231aafe61f28585b4347b4 | |
| parent | 01179bb945790e349f8c872991074fe52da40772 (diff) | |
| download | uGFX-04fdc1a2563342b142cf3d1fe7808fae286e27e0.tar.gz uGFX-04fdc1a2563342b142cf3d1fe7808fae286e27e0.tar.bz2 uGFX-04fdc1a2563342b142cf3d1fe7808fae286e27e0.zip | |
Sync repo again
| -rw-r--r-- | glcd.h | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -55,11 +55,7 @@ void lcdDrawRectString(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, const void lcdDrawCircle(uint16_t x, uint16_t y, uint16_t radius, uint8_t filled, uint16_t color); void lcdSetFontTransparency(uint8_t transparency); -<<<<<<< HEAD -void lcdSetFont(const uint8_t *fnt); -======= void lcdSetFont(const uint8_t *newFont); ->>>>>>> cleanups void lcdDrawChar(char c); void lcdPutString(const char *str); void lcdDrawString(uint16_t x, uint16_t y, const char *str, uint16_t color, uint16_t bkcolor); |