2 Commits

Author	SHA1	Message	Date
John Wellbelove	df83a04166	Merge remote-tracking branch 'origin/master' into feature/no_stl ... # Conflicts: # include/etl/memory.h # include/etl/private/ivectorpointer.h # include/etl/stl/alternate/limits.h # include/etl/stl/iterator.h # test/test_no_stl_algorithm.cpp # test/test_no_stl_functional.cpp # test/test_no_stl_limits.cpp # test/test_no_stl_utility.cpp # test/test_vector_pointer.cpp # test/vs2017/etl.vcxproj.filters	2018-08-18 10:09:56 +01:00
John Wellbelove	88cc021c8c	Merge remote-tracking branch 'origin/development' ... # Conflicts: # examples/ArmTimerCallbacks - C++/RTE/Device/STM32F401RETx/startup_stm32f401xe.s # examples/ArmTimerCallbacks - C++/RTE/Device/STM32F401RETx/system_stm32f4xx.c # examples/ArmTimerCallbacks/RTE/Device/STM32F401RETx/startup_stm32f401xe.s # examples/ArmTimerCallbacks/RTE/Device/STM32F401RETx/system_stm32f4xx.c # library.properties # test/codeblocks/ETL.cbp # test/keil/startup_stm32f401xe.s # test/keil/system_stm32f4xx.c # test/vs2017/etl.vcxproj # test/vs2017/etl.vcxproj.filters	2017-10-24 12:54:09 +01:00