Merge branch 'update/version_4_2_5' into 'release/v4.2'

Update version to 4.2.5

See merge request espressif/esp-idf!24489
release/v4.2
Ivan Grokhotkov 2023-06-29 23:55:49 +08:00
commit 5f8de192fa
3 zmienionych plików z 3 dodań i 3 usunięć

Wyświetl plik

@ -23,7 +23,7 @@ extern "C" {
/** Minor version number (x.X.x) */ /** Minor version number (x.X.x) */
#define ESP_IDF_VERSION_MINOR 2 #define ESP_IDF_VERSION_MINOR 2
/** Patch version number (x.x.X) */ /** Patch version number (x.x.X) */
#define ESP_IDF_VERSION_PATCH 4 #define ESP_IDF_VERSION_PATCH 5
/** /**
* Macro to convert IDF version number into an integer * Macro to convert IDF version number into an integer

Wyświetl plik

@ -1,3 +1,3 @@
IDF_VERSION_MAJOR := 4 IDF_VERSION_MAJOR := 4
IDF_VERSION_MINOR := 2 IDF_VERSION_MINOR := 2
IDF_VERSION_PATCH := 4 IDF_VERSION_PATCH := 5

Wyświetl plik

@ -1,3 +1,3 @@
set(IDF_VERSION_MAJOR 4) set(IDF_VERSION_MAJOR 4)
set(IDF_VERSION_MINOR 2) set(IDF_VERSION_MINOR 2)
set(IDF_VERSION_PATCH 4) set(IDF_VERSION_PATCH 5)