aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@seriouslyembedded.com>2015-08-16 17:23:05 +0200
committerJoel Bodenmann <joel@seriouslyembedded.com>2015-08-16 17:23:05 +0200
commit02d493a34680792083d7a1dbd01ca66c05b6e242 (patch)
tree55d307206414cae39b0252143aba6a6d559ddead /docs
parent3fea02324831eba1773f45b1dc6d0bf2a0c8326d (diff)
parent28a2d8ca791b8bc74e52a26773ab3863bc37f145 (diff)
downloaduGFX-02d493a34680792083d7a1dbd01ca66c05b6e242.tar.gz
uGFX-02d493a34680792083d7a1dbd01ca66c05b6e242.tar.bz2
uGFX-02d493a34680792083d7a1dbd01ca66c05b6e242.zip
Merge branch 'master' into TextEdit
Conflicts: docs/releases.txt
Diffstat (limited to 'docs')
-rw-r--r--docs/releases.txt13
1 files changed, 7 insertions, 6 deletions
diff --git a/docs/releases.txt b/docs/releases.txt
index c82119a7..7c49f185 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -9,12 +9,13 @@ FEATURE: Added GFXSINGLEMAKE=yes|no to the ugfx makefile to compile ugfx as a si
FEATURE: New board STM32F746G-Discovery
FEATURE: New gdisp driver STM32LTDC
FEATURE: Better support for Raw32 platforms
-FEATURE: Implementing widget focusing. See gwinSetFocus() and gwinGetFocus()
-FEATURE: Adding more font metrics (BaselineX and BaselineY)
-FEATURE: Adding gdispGetStringWidthCount()
-FEATURE: Adding TextEdit widget
-FEATURE: Added color to widget style for focused widgets
-FEATURE: Added GWIN_FOCUS_HIGHLIGHT_WIDTH as an option in the configuration file
+FEATURE: Renaming GFX_NO_OS_INIT to GFX_OS_NO_INIT
+FEATURE: Implementing widget focusing. See gwinSetFocus() and gwinGetFocus()
+FEATURE: Adding more font metrics (BaselineX and BaselineY)
+FEATURE: Adding gdispGetStringWidthCount()
+FEATURE: Adding TextEdit widget
+FEATURE: Added color to widget style for focused widgets
+FEATURE: Added GWIN_FOCUS_HIGHLIGHT_WIDTH as an option in the configuration file
*** Release 2.3 ***