John Wellbelove bda8c8bff4 Merge remote-tracking branch 'origin/master' into feature/C++11_variadic_templates ... # Conflicts: # include/etl/type_traits.h # include/etl/type_traits_generator.h # include/etl/version.h # support/Release notes.txt # test/test_string_u16.cpp # test/test_string_u32.cpp # test/test_string_wchar_t.cpp # test/test_type_traits.cpp # test/vs2017/etl.vcxproj # test/vs2017/etl.vcxproj.filters		2019-05-25 16:08:50 +01:00
..
etl	Merge remote-tracking branch 'origin/master' into feature/C++11_variadic_templates	2019-05-25 16:08:50 +01:00