Merge remote-tracking branch 'origin/hotfix/quick_fixes' into development

This commit is contained in:
John Wellbelove 2019-09-24 10:39:50 +01:00
commit 57779e48c7
3 changed files with 13 additions and 3 deletions

View File

@ -39,7 +39,7 @@ SOFTWARE.
#define ETL_VERSION_MAJOR 14
#define ETL_VERSION_MINOR 31
#define ETL_VERSION_PATCH 1
#define ETL_VERSION_PATCH 2
#define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) "." ETL_STRINGIFY(ETL_VERSION_MINOR) "." ETL_STRINGIFY(ETL_VERSION_PATCH)
#define ETL_VERSION_W ETL_STRINGIFY(ETL_VERSION_MAJOR) L"." ETL_STRINGIFY(ETL_VERSION_MINOR) L"." ETL_STRINGIFY(ETL_VERSION_PATCH)

View File

@ -3,12 +3,18 @@
"version": "14.31.1",
"authors": {
"name": "John Wellbelove",
"email": "<john.wellbelove@etlcpp.com>"
"email": "<john.wellbelove@etlcpp.com>"
},
"homepage": "https://www.etlcpp.com/",
"license": "MIT",
"description": "A C++ template library tailored for embedded systems.",
"repository": "https://github.com/ETLCPP/etl.git",
"repository": {
"type": "git",
"url": "https://github.com/ETLCPP/etl.git"
},
"build": {
"includeDir": "include"
},
"platforms": "*",
"frameworks": "*"
}

View File

@ -1,3 +1,7 @@
===============================================================================
14.31.2
More PIO json tweaks
===============================================================================
14.31.1
Fix error in PIO json