4 Commits

Author SHA1 Message Date
John Wellbelove
792cb7bcc8 Merge remote-tracking branch 'origin/feature/no_stl_unit_tests' into development
# Conflicts:
#	include/etl/private/choose_pair_types.h
#	include/etl/private/choose_tag_types.h
#	include/etl/version.h
#	library.json
#	library.properties
#	support/Release notes.txt
2019-12-02 12:05:27 +00:00
John Wellbelove
0f91072e3f More fixes for nullptr on ARM5/ARM6 compilers 2018-09-02 14:05:27 +01:00
John Wellbelove
079904c73c Updated ARM example 2018-08-09 20:36:25 +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