Merge remote-tracking branch 'origin/development'

# Conflicts: # include/etl/private/pvoidvector.h # include/etl/version.h # support/Release notes.txt
ETLCPP · Dec 9, 2018 · f2f2339 · f2f2339
1 parent bb9b07a
commit f2f2339
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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.