Merge branch 'feature/ver-4.1' into 'master'

global: bump version to 4.1

See merge request espressif/esp-idf!5771
This commit is contained in:
Angus Gratton 2019-08-14 09:01:48 +08:00
commit 70794a0776
3 changed files with 3 additions and 3 deletions

View file

@ -21,7 +21,7 @@ extern "C" {
/** Major version number (X.x.x) */ /** Major version number (X.x.x) */
#define ESP_IDF_VERSION_MAJOR 4 #define ESP_IDF_VERSION_MAJOR 4
/** Minor version number (x.X.x) */ /** Minor version number (x.X.x) */
#define ESP_IDF_VERSION_MINOR 0 #define ESP_IDF_VERSION_MINOR 1
/** Patch version number (x.x.X) */ /** Patch version number (x.x.X) */
#define ESP_IDF_VERSION_PATCH 0 #define ESP_IDF_VERSION_PATCH 0

View file

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

View file

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