2 Commits

Author SHA1 Message Date
John Wellbelove
3fdf3e6b1a Merge remote-tracking branch 'origin/feature/no_stl' into development
# Conflicts:
#	include/etl/private/ivectorpointer.h
#	test/test_vector_pointer.cpp
2018-07-22 20:51:03 +01:00
John Wellbelove
7fbc543080 Merge remote-tracking branch 'origin/feature/CMake' into development
# Conflicts:
#	test/vs2017/etl.vcxproj.filters
2018-05-31 22:21:09 +01:00