2 Commits

Author SHA1 Message Date
John Wellbelove
37d2d9e084 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/private/minmax_pop.h
2018-04-29 20:23:22 +01:00
John Wellbelove
d7f9d1a7fb Merge remote-tracking branch 'origin/development'
# Conflicts:
#	CMakeLists.txt
2018-03-18 19:29:36 +00:00