aboutsummaryrefslogtreecommitdiffstats
path: root/include/gdisp/gdisp.h
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2013-06-22 23:14:54 +1000
committerinmarket <andrewh@inmarket.com.au>2013-06-22 23:14:54 +1000
commitc8300fe9c2c7facff1ad32978a5d961690473de4 (patch)
tree0e653df0a5d733e254b2d5d3a463968285340837 /include/gdisp/gdisp.h
parentd362d9603e9d161e7006282f882205754e5afc58 (diff)
parent9aa1e95423f681277d048bed6b9acc5101f2cbe2 (diff)
downloaduGFX-c8300fe9c2c7facff1ad32978a5d961690473de4.tar.gz
uGFX-c8300fe9c2c7facff1ad32978a5d961690473de4.tar.bz2
uGFX-c8300fe9c2c7facff1ad32978a5d961690473de4.zip
Merge branch 'master' into GWIN
Diffstat (limited to 'include/gdisp/gdisp.h')
-rw-r--r--include/gdisp/gdisp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gdisp/gdisp.h b/include/gdisp/gdisp.h
index f7208b00..4ba72580 100644
--- a/include/gdisp/gdisp.h
+++ b/include/gdisp/gdisp.h
@@ -522,7 +522,7 @@ extern "C" {
#if GDISP_NEED_SCROLL || defined(__DOXYGEN__)
/**
* @brief Scroll vertically a section of the screen.
- * @pre GDISP_NEED_SCROLL must be set to TRUE in halconf.h
+ * @pre GDISP_NEED_SCROLL must be set to TRUE in gfxconf.h
* @note Optional.
* @note If lines is >= cy, it is equivelent to a area fill with bgcolor.
*