merge dev-6.1

2019-11-15 06:53:15 +01:00
parent 00517116cc bf5ea6658b
commit e6d38f1acf
42 changed files with 2044 additions and 460 deletions
--- a/src/lv_objx/lv_slider.c
+++ b/src/lv_objx/lv_slider.c
@@ -12,6 +12,7 @@

 #include "../lv_core/lv_debug.h"
 #include "../lv_core/lv_group.h"
+#include "../lv_core/lv_indev.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_math.h"