mirror of
https://github.com/ETLCPP/etl.git
synced 2026-11-09 14:49:53 +08:00
Merge remote-tracking branch 'origin/development'
# Conflicts: # test/test_string_u16.cpp # test/test_string_u32.cpp # test/test_string_wchar_t.cpp # test/vs2017/etl.vcxproj.filters
This commit is contained in:
parent
788566cc00
commit
1b19c6c398
@ -38,8 +38,8 @@ SOFTWARE.
|
||||
///\ingroup utilities
|
||||
|
||||
#define ETL_VERSION_MAJOR 14
|
||||
#define ETL_VERSION_MINOR 23
|
||||
#define ETL_VERSION_PATCH 1
|
||||
#define ETL_VERSION_MINOR 24
|
||||
#define ETL_VERSION_PATCH 0
|
||||
|
||||
#define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) ETL_STRINGIFY(ETL_VERSION_MINOR) ETL_STRINGIFY(ETL_VERSION_PATCH)
|
||||
#define ETL_VERSION_W ETL_WIDE_STRING(ETL_CONCAT(ETL_CONCAT(ETL_VERSION_MAJOR, ETL_VERSION_MINOR), ETL_VERSION_PATCH))
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
===============================================================================
|
||||
14.24.0
|
||||
Added 'delegate' and 'delegate_service'.
|
||||
|
||||
===============================================================================
|
||||
14.23.1
|
||||
Added missing 'cleanup' to string's resize() method.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user