2 Commits

Author SHA1 Message Date
John Wellbelove
aee76d67e8 Merge remote-tracking branch 'origin/feature/bit_stream' into development
# Conflicts:
#	include/etl/profiles/armv6.h
#	include/etl/profiles/armv6_no_stl.h
#	include/etl/version.h
#	support/Release notes.txt
#	test/vs2017/etl.vcxproj.filters
2018-10-07 08:37:14 +01:00
John Wellbelove
0b0ce2645b Merge remote-tracking branch 'origin/feature/shared_pools' into development
# Conflicts:
#	include/etl/list.h
2018-08-22 20:13:18 +01:00