Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/private/pvoidvector.h
#	include/etl/version.h
#	support/Release notes.txt
This commit is contained in:
John Wellbelove 2018-12-09 12:32:31 +00:00
parent bb9b07a837
commit f2f23395cd
2 changed files with 5 additions and 1 deletions

View File

@ -38,7 +38,7 @@ SOFTWARE.
///\ingroup utilities
#define ETL_VERSION_MAJOR 14
#define ETL_VERSION_MINOR 3
#define ETL_VERSION_MINOR 4
#define ETL_VERSION_PATCH 0
#define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) ETL_STRINGIFY(ETL_VERSION_MINOR) ETL_STRINGIFY(ETL_VERSION_PATCH)

View File

@ -1,3 +1,7 @@
===============================================================================
14.4.0
Added C++03/C++11 emplace for deque, priority_queue, queues, stack, variant & vector.
===============================================================================
14.3.0
etl::forward_list supports shared pools.