merge master

2020-12-01 15:32:49 +01:00
parent 45b8f5856d 2aad9aaebd
commit d51bb29c24
5 changed files with 220 additions and 0 deletions
--- a/lvgl.h
+++ b/lvgl.h
@@ -14,9 +14,15 @@ extern "C" {
 /***************************
 * CURRENT VERSION OF LVGL
 ***************************/
+<<<<<<< HEAD
 #define LVGL_VERSION_MAJOR 8
 #define LVGL_VERSION_MINOR 0
 #define LVGL_VERSION_PATCH 0
+=======
+#define LVGL_VERSION_MAJOR 7
+#define LVGL_VERSION_MINOR 8
+#define LVGL_VERSION_PATCH 1
+>>>>>>> master
 #define LVGL_VERSION_INFO "dev"

 /*********************