uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Sync repo

Browse Source
This commit is contained in:
Kumar Abhishek 2012-06-14 17:14:05 +05:30
parent be23213164
commit 01179bb945
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glcd.c
View File

@ -104,13 +104,8 @@ void lcdDrawLine(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t co
}
}
<<<<<<< HEAD
void lcdSetFont(const uint8_t *fnt) {
font = fnt;
=======
void lcdSetFont(const uint8_t *newFont) {
font = newFont;
>>>>>>> cleanups
}
void lcdSetFontTransparency(uint8_t transparency) {