merge dev-6.1

2019-12-02 16:09:35 +01:00
parent 7137ae4b33 4037a68ccc
commit 64df282c81
52 changed files with 14958 additions and 10010 deletions
--- a/lvgl.h
+++ b/lvgl.h
@@ -34,6 +34,7 @@ extern "C" {
 #include "src/lv_font/lv_font.h"
 #include "src/lv_font/lv_font_fmt_txt.h"
 #include "src/lv_misc/lv_bidi.h"
+#include "src/lv_misc/lv_printf.h"

 #include "src/lv_objx/lv_btn.h"
 #include "src/lv_objx/lv_imgbtn.h"