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

Update version to 4.2.1

See merge request espressif/esp-idf!13390
This commit is contained in:
Angus Gratton
2021-05-05 23:12:32 +00:00
3 changed files with 3 additions and 3 deletions

View File

@@ -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 0 #define ESP_IDF_VERSION_PATCH 1
/** /**
* Macro to convert IDF version number into an integer * Macro to convert IDF version number into an integer

View File

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

View File

@@ -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 0) set(IDF_VERSION_PATCH 1)