2 Commits

Author SHA1 Message Date
John Wellbelove
bb9b07a837 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/private/pvoidvector.h
2018-12-09 12:15:42 +00:00
John Wellbelove
0e38e6959a Merge remote-tracking branch 'origin/feature/memory_models' into development
# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
2018-07-29 12:55:23 +01:00