From 42c3ee4938557f48a32f07e158361ed44300303a Mon Sep 17 00:00:00 2001
From: John Wellbelove <github@wellbelove.co.uk>
Date: Sat, 27 Apr 2019 16:15:37 +0100
Subject: [PATCH] Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
#	test/vs2017/etl.vcxproj.filters
---
 test/codeblocks/ETL.cbp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/codeblocks/ETL.cbp b/test/codeblocks/ETL.cbp
index a7041a42..a4bfe86e 100644
--- a/test/codeblocks/ETL.cbp
+++ b/test/codeblocks/ETL.cbp
@@ -231,6 +231,7 @@
 		<Unit filename="../../include/etl/message_router_generator.h" />
 		<Unit filename="../../include/etl/message_timer.h" />
 		<Unit filename="../../include/etl/message_types.h" />
+		<Unit filename="../../include/etl/multi_array.h" />
 		<Unit filename="../../include/etl/multimap.h" />
 		<Unit filename="../../include/etl/multiset.h" />
 		<Unit filename="../../include/etl/murmur3.h" />
@@ -397,6 +398,7 @@
 		<Unit filename="../test_message_bus.cpp" />
 		<Unit filename="../test_message_router.cpp" />
 		<Unit filename="../test_message_timer.cpp" />
+		<Unit filename="../test_multi_array.cpp" />
 		<Unit filename="../test_multimap.cpp" />
 		<Unit filename="../test_multiset.cpp" />
 		<Unit filename="../test_murmur3.cpp" />