diff options
author | inmarket <andrewh@inmarket.com.au> | 2015-10-13 01:00:48 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2015-10-13 01:00:48 +1000 |
commit | 9d3fc8b36cb57fa23c0b838a54a8bc67328f9672 (patch) | |
tree | fee15031006a070adb49279540067e90aa6be934 /src/gwin/gwin_mk.c | |
parent | 92b000291826ca78c30f205c104ac330484b82c9 (diff) | |
parent | 10c7471149453cea6686aa6f61ec6dac0525c47b (diff) | |
download | uGFX-9d3fc8b36cb57fa23c0b838a54a8bc67328f9672.tar.gz uGFX-9d3fc8b36cb57fa23c0b838a54a8bc67328f9672.tar.bz2 uGFX-9d3fc8b36cb57fa23c0b838a54a8bc67328f9672.zip |
Merge branch 'master' into Keil
Diffstat (limited to 'src/gwin/gwin_mk.c')
-rw-r--r-- | src/gwin/gwin_mk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gwin/gwin_mk.c b/src/gwin/gwin_mk.c index 981eb6d2..2af501b5 100644 --- a/src/gwin/gwin_mk.c +++ b/src/gwin/gwin_mk.c @@ -24,3 +24,4 @@ #include "gwin_gl3d.c" #include "gwin_keyboard.c" #include "gwin_keyboard_layout.c" +#include "gwin_textedit.c" |