diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-01-06 21:54:31 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-01-06 21:54:31 +0100 |
| commit | 66c5403d8f48730b0ef4cd59c063184effd81284 (patch) | |
| tree | 9b39b6c84fa9ce8b2312593772633b0aa6aaff53 /include | |
| parent | 6f5dd9035467b6a57189c8382cf911993d596388 (diff) | |
| parent | 192335ea3595a2c162857a6a1eebb672f82bf180 (diff) | |
| download | uGFX-66c5403d8f48730b0ef4cd59c063184effd81284.tar.gz uGFX-66c5403d8f48730b0ef4cd59c063184effd81284.tar.bz2 uGFX-66c5403d8f48730b0ef4cd59c063184effd81284.zip | |
Merge branch 'master' into gwin
Diffstat (limited to 'include')
| -rw-r--r-- | include/gdisp/gdisp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gdisp/gdisp.h b/include/gdisp/gdisp.h index 8f379bfd..d1d78145 100644 --- a/include/gdisp/gdisp.h +++ b/include/gdisp/gdisp.h @@ -681,8 +681,8 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co * * @param[in] g The display to use * @param[in] x,y The position for the text - * @param[in] font The font to use * @param[in] str The string to draw + * @param[in] font The font to use * @param[in] color The color to use * * @api |