aboutsummaryrefslogtreecommitdiffstats
path: root/gfxconf.example.h
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 /gfxconf.example.h
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 'gfxconf.example.h')
-rw-r--r--gfxconf.example.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/gfxconf.example.h b/gfxconf.example.h
index 0140c4fc..d2582df9 100644
--- a/gfxconf.example.h
+++ b/gfxconf.example.h
@@ -42,7 +42,7 @@
// #define GFX_COMPILER GFX_COMPILER_UNKNOWN
// #define GFX_CPU GFX_CPU_UNKNOWN
// #define GFX_OS_HEAP_SIZE 0
-// #define GFX_NO_OS_INIT FALSE
+// #define GFX_OS_NO_INIT FALSE
// #define GFX_OS_INIT_NO_WARNING FALSE
// #define GFX_OS_EXTRA_INIT_FUNCTION myOSInitRoutine
// #define GFX_OS_EXTRA_DEINIT_FUNCTION myOSDeInitRoutine