39 Commits

Author SHA1 Message Date
John Wellbelove
65fc448f00 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	library.properties
2017-11-14 13:13:44 +00:00
John Wellbelove
d0d53d403f Merge branch 'development' 2017-11-12 10:31:22 +00:00
John Wellbelove
7d75859add Update to 10.3.1 2017-11-01 10:04:25 +00:00
John Wellbelove
9035b02183 Updated to 10.3.0 2017-10-27 11:27:09 +01:00
John Wellbelove
0924f58b74 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	library.properties
#	src/atomic/atomic_arm.h
#	src/atomic/atomic_gcc.h
#	test/vs2017/etl.vcxproj
#	test/vs2017/etl.vcxproj.filters
2017-10-25 21:28:05 +01:00
John Wellbelove
38138ff40f Merge remote-tracking branch 'origin/development'
# Conflicts:
#	library.properties
2017-10-25 09:48:40 +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
John Wellbelove
13de62bd4f Merge remote-tracking branch 'origin/development'
# Conflicts:
#	library.properties
#	src/callback_timer.h
#	src/message_timer.h
#	test/test_callback_timer.cpp
#	test/test_message_timer.cpp
2017-10-21 09:24:16 +01:00
John Wellbelove
a47109783e Merge remote-tracking branch 'origin/development'
# Conflicts:
#	library.properties
#	src/callback_timer.h
#	src/message_timer.h
#	test/codeblocks/ETL.cbp
#	test/codeblocks/ETL.depend
#	test/test_callback_timer.cpp
#	test/test_message_timer.cpp
#	test/vs2017/etl.vcxproj.filters
2017-10-19 18:34:21 +01:00
John Wellbelove
0bfd212a54 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	examples/ArmTimerCallbacks/RTE/Device/STM32F401RETx/startup_stm32f401xe.s
#	examples/ArmTimerCallbacks/RTE/Device/STM32F401RETx/system_stm32f4xx.c
#	library.properties
#	test/codeblocks/ETL.cbp
#	test/codeblocks/ETL.depend
#	test/codeblocks/ETL.layout
#	test/vs2017/etl.vcxproj
#	test/vs2017/etl.vcxproj.filters
2017-10-18 09:23:17 +01:00
John Wellbelove
9acfc2c9a6 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	library.properties
#	test/codeblocks/ETL.depend
#	test/codeblocks/ETL.layout
2017-09-21 14:28:18 +01:00
John Wellbelove
68c964a45a Merge branch 'development'
# Conflicts:
#	test/codeblocks/.gitignore
#	test/codeblocks/ETL.depend
#	test/codeblocks/ETL.layout
#	test/test_type_lookup.cpp
2017-09-19 08:38:57 +01:00
John Wellbelove
9100a5287d Raised version to 9.5.1 2017-08-22 09:36:59 +01:00
John Wellbelove
cac9bda6f7 Raised version to 9.5.0 2017-08-19 12:45:28 +01:00
John Wellbelove
324a06dbce Updated version to 9.4.1 2017-08-18 12:59:38 +01:00
John Wellbelove
2192e7f896 Updated version to 9.4.0 2017-08-17 15:50:58 +01:00
John Wellbelove
aff4ae8b64 Updated version to 9.3.2 2017-08-16 14:19:25 +01:00
John Wellbelove
302646850e Merge remote-tracking branch 'origin/development'
# Conflicts:
#	src/algorithm.h
#	test/codeblocks/ETL.depend
#	test/vs2017/etl.vcxproj.filters
2017-08-08 18:46:21 +01:00
John Wellbelove
f03af2aeae Merge remote-tracking branch 'origin/development'
# Conflicts:
#	src/algorithm.h
#	test/codeblocks/ETL.depend
2017-08-08 08:55:52 +01:00
John Wellbelove
6b71f6d604 Updated version. 2017-07-25 12:41:38 +01:00
John Wellbelove
c95c2a30df Added emplace functions supporting up to four parameters to the following containers.
forward_list
list
vector
queue
priority_queue
stack

# Conflicts:
#	src/vector.h
#	test/data.h
#	test/vs2017/random.csv
2017-07-21 12:00:15 +01:00
John Wellbelove
72ce7ac6e3 Updated to next version. 2017-07-06 18:11:26 +01:00
John Wellbelove
a51530a96c Completed modification of flat map/set classes to use reference flat map/set as bases. 2017-06-25 21:25:54 +01:00
John Wellbelove
3a89aaf612 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	src/cstring.h
#	src/flat_map.h
#	src/set.h
#	src/u16string.h
#	src/u32string.h
#	src/wstring.h
#	test/test_string_char.cpp
#	test/test_string_u16.cpp
#	test/test_string_u32.cpp
#	test/test_string_wchar_t.cpp
#	test/vs2017/etl.vcxproj.filters
2017-06-17 17:52:17 +01:00
John Wellbelove
e12cef864f Updated version to 9.1.5
# Conflicts:
#	library.properties
2017-06-14 23:40:17 +01:00
John Wellbelove
30b7f1698d Updated version to 9.1.5 2017-06-14 20:28:26 +01:00
John Wellbelove
8f88066a64 Updated to 9.1.4 2017-06-13 11:29:38 +01:00
John Wellbelove
6232c20adc Changed to version 9.1.3 2017-04-28 22:22:37 +01:00
John Wellbelove
06583f3edf Updated to 9.1.2 2017-03-15 12:28:28 +00:00
jwellbelove
fdc73603e1 Updated version to 9.1.0 2017-03-06 13:29:42 +00:00
John Wellbelove
0112c57235 Updated to version 9.0.0 2016-12-28 14:10:30 +00:00
John Wellbelove
aa3cf653e8 Updated version to 8.2.0 2016-07-31 09:23:56 +01:00
John Wellbelove
d8bdd6025e Modified to 8.1.0 2016-05-18 07:15:02 +01:00
John Wellbelove
0a3ed9c042 Updated to 8.0.5 2016-05-17 19:30:48 +01:00
John Wellbelove
434ec07209 Updated to 8.0.4 to include new debounce class. 2016-05-10 19:13:10 +01:00
John Wellbelove
d0dfcc0da8 Update version for Arduino 2016-03-13 12:33:49 +00:00
John Wellbelove
c908d3fcea Changes for GCC compatibility 2016-03-02 21:11:32 +00:00
John Wellbelove
eb14bee98c Updated version number 2016-02-28 14:30:27 +00:00
John Wellbelove
b7da660535 File for Arduino library integration. 2016-02-28 14:16:14 +00:00