From 35b3a1f2a4413366fecb2ee7fc85fb7f40409fd9 Mon Sep 17 00:00:00 2001
From: Gabor Kiss-Vamosi <kisvegabor@gmail.com>
Date: Tue, 21 Jul 2020 13:42:02 +0200
Subject: [PATCH] merge dev

---
 CHANGELOG.md | 8 +++++---
 lvgl.h       | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 581b4355a..e607b8987 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,17 @@
 # Changelog
 
+## v7.4.0 (planned on 18.08.2020)
+*Available in the `dev` branch*
+
 ## v7.3.0 (planned on 04.08.2020)
-Available in the `dev` branch
+*Available in the `master` branch*
 
 ### New features
 - Add `lv_task_get_next`
 - Add `lv_event_send_refresh`, `lv_event_send_refresh_recursive` to easily send `LV_EVENT_REFRESH` to object
 - Add `lv_tabview_set_tab_name()` function - used to change a tab's name
 
-## v7.2.0 (planned on 21.07.2020)
-*Available in the `master` branch*
+## v7.2.0 (21.07.2020)
 
 ### New features
 - Add `LV_CALENDAR_WEEK_STARTS_MONDAY`
diff --git a/lvgl.h b/lvgl.h
index 94a53df2c..f90729d7b 100644
--- a/lvgl.h
+++ b/lvgl.h
@@ -79,7 +79,7 @@ extern "C" {
 #define LVGL_VERSION_MAJOR   7
 #define LVGL_VERSION_MINOR   3
 #define LVGL_VERSION_PATCH   0
-#define LVGL_VERSION_INFO ""
+#define LVGL_VERSION_INFO "dev"
 
 /**********************
  *      TYPEDEFS