Merge remote-tracking branch 'origin/development'

# Conflicts:
#	library.properties
#	support/Release notes.txt
#	test/codeblocks/ETL.layout
#	test/vs2017/etl.vcxproj
#	test/vs2017/etl.vcxproj.filters

library.properties

@@ -1,5 +1,5 @@
 name=Embedded Template Library
-version=10.21.1
+version=10.21.2
 author= John Wellbelove <john.wellbelove@etlcpp.com>
 maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
 sentence=A C++ template library tailored for embedded systems.

src/version.h

@@ -0,0 +1,46 @@
+///\file
+
+/******************************************************************************
+The MIT License(MIT)
+
+Embedded Template Library.
+https://github.com/ETLCPP/etl
+https://www.etlcpp.com
+
+Copyright(c) 2018 jwellbelove
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+******************************************************************************/
+
+#ifndef __ETL_VERSION__
+#define __ETL_VERSION__
+
+#include <stdint.h>
+
+///\defgroup version version
+/// Definitions of the ETL version
+///\ingroup utilities
+
+#define ETL_VERSION "10.21.2"
+#define ETL_VERSION_MAJOR 10
+#define ETL_VERSION_MINOR 21
+#define ETL_VERSION_PATCH  2
+
+#endif
+

support/Release notes.txt

@@ -1,3 +1,7 @@
+===============================================================================
+10.21.2
+Added version.h
+
 ===============================================================================
 10.21.1
 Removal of GCC warnings from variant.h.

test/codeblocks/ETL.cbp

@@ -208,6 +208,7 @@
 		<Unit filename="../../src/variant.h" />
 		<Unit filename="../../src/variant_pool.h" />
 		<Unit filename="../../src/vector.h" />
+		<Unit filename="../../src/version.h" />
 		<Unit filename="../../src/visitor.h" />
 		<Unit filename="../../src/wstring.h" />
 		<Unit filename="../../unittest-cpp/UnitTest++/AssertException.cpp" />

test/vs2017/etl.vcxproj

@@ -172,6 +172,7 @@
     <ClInclude Include="..\..\src\type_traits_generator.h" />
     <ClInclude Include="..\..\src\variant_pool.h" />
     <ClInclude Include="..\..\src\variant_pool_generator.h" />
+    <ClInclude Include="..\..\src\version.h" />
     <ClInclude Include="..\..\unittest-cpp\UnitTest++\AssertException.h" />
     <ClInclude Include="..\..\unittest-cpp\UnitTest++\CheckMacros.h" />
     <ClInclude Include="..\..\unittest-cpp\UnitTest++\Checks.h" />

test/vs2017/etl.vcxproj.filters

@@ -576,6 +576,9 @@
     <ClInclude Include="..\..\src\variant_pool_generator.h">
       <Filter>ETL\Containers\Generators</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\version.h">
+      <Filter>ETL\Utilities</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\main.cpp">