4 Commits

Author SHA1 Message Date
John Wellbelove
7afcc2bb19 Small compatibility fix to nullptr.h 2020-03-18 00:56:50 +00:00
John Wellbelove
e6617dc7e7 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/version.h
#	library.json
#	library.properties
#	support/Release notes.txt
2020-02-12 09:40:20 +01:00
John Wellbelove
83347ccfdd Work in progress 2020-01-09 11:15:50 +00:00
John Wellbelove
d9f79715e4 Merge remote-tracking branch 'origin/feature/delegates' into development
# Conflicts:
#	include/etl/delegate.h
#	include/etl/version.h
#	support/Release notes.txt
#	test/test_delegate.cpp
2019-05-22 20:18:11 +01:00