2 Commits

Author SHA1 Message Date
John Wellbelove
a5fb2dfc99 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/delegate.h
#	include/etl/version.h
#	support/Release notes.txt
#	test/test_delegate.cpp
2019-05-22 20:21:07 +01:00
John Wellbelove
788566cc00 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	test/test_string_u16.cpp
#	test/test_string_u32.cpp
#	test/test_string_wchar_t.cpp
#	test/vs2017/etl.vcxproj.filters
2019-05-19 23:24:12 +01:00