From 343605ebac1c2a4c684a01cebc970d64aea5e747 Mon Sep 17 00:00:00 2001
From: Gabor Kiss-Vamosi <kisvegabor@gmail.com>
Date: Tue, 1 Sep 2020 11:34:10 +0200
Subject: [PATCH] prepare to release v7.4.0

---
 CHANGELOG.md           | 2 +-
 library.json           | 2 +-
 library.properties     | 2 +-
 lvgl.h                 | 2 +-
 src/lv_conf_internal.h | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 455c9634e..bcdf6b855 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## v7.4.0 (planned on 01.09.2020)
+## v7.4.0 (01.09.2020)
 
 The main new features of v7.4 are run-time font loading, style caching and arc knob with value setting by click.
 
diff --git a/library.json b/library.json
index a6eb48edf..5f6adb3ed 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
 {
 	"name": "lvgl",
-    "version": "7.3.1",
+    "version": "7.4.0",
 	"keywords": "graphics, gui, embedded, tft, lvgl",
 	"description": "Graphics library to create embedded GUI with easy-to-use graphical elements, beautiful visual effects and low memory footprint. It offers anti-aliasing, opacity, and animations using only one frame buffer.",
 	"repository": {
diff --git a/library.properties b/library.properties
index 44897bb54..4a160a47f 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=lvgl
-version=7.3.1
+version=7.4.0
 author=kisvegabor
 maintainer=kisvegabor,embeddedt,pete-pjb
 sentence=Full-featured Graphics Library for Embedded Systems
diff --git a/lvgl.h b/lvgl.h
index fb18d9ff2..ee54e2d80 100644
--- a/lvgl.h
+++ b/lvgl.h
@@ -17,7 +17,7 @@ extern "C" {
 #define LVGL_VERSION_MAJOR   7
 #define LVGL_VERSION_MINOR   4
 #define LVGL_VERSION_PATCH   0
-#define LVGL_VERSION_INFO "dev"
+#define LVGL_VERSION_INFO ""
 
 /*********************
  *      INCLUDES
diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h
index 8a031535f..0f5f28ac0 100644
--- a/src/lv_conf_internal.h
+++ b/src/lv_conf_internal.h
@@ -1049,8 +1049,9 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */
 
 /*Rotary (dependencies: lv_arc, lv_btn)*/
 #ifndef LV_USE_ROTARY
-#define LV_USE_ROTARY    1
+#define LV_USE_ROTARY     1
 #endif
+
 /*Slider (dependencies: lv_bar)*/
 #ifndef LV_USE_SLIDER
 #define LV_USE_SLIDER    1