From f2f23395cde34704686233094d9619ad8d06453a Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 9 Dec 2018 12:32:31 +0000 Subject: [PATCH] Merge remote-tracking branch 'origin/development' # Conflicts: # include/etl/private/pvoidvector.h # include/etl/version.h # support/Release notes.txt --- include/etl/version.h | 2 +- support/Release notes.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/etl/version.h b/include/etl/version.h index d734bab69..f80f9f29b 100644 --- a/include/etl/version.h +++ b/include/etl/version.h @@ -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) diff --git a/support/Release notes.txt b/support/Release notes.txt index 0ba6ff69c..a7aaf553f 100644 --- a/support/Release notes.txt +++ b/support/Release notes.txt @@ -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.