John Wellbelove
|
dcb1e75358
|
Merge remote-tracking branch 'origin/development'
# Conflicts:
# include/etl/deque.h
# include/etl/private/pvoidvector.h
# include/etl/version.h
# support/Release notes.txt
|
2018-12-16 22:19:31 +00:00 |
|
John Wellbelove
|
fc09a70051
|
Merge remote-tracking branch 'origin/development'
|
2018-10-28 15:37:46 +00:00 |
|
John Wellbelove
|
2e0980420b
|
Merge remote-tracking branch 'origin/development'
|
2018-08-27 23:33:45 +01:00 |
|
John Wellbelove
|
bd008350a2
|
Merge remote-tracking branch 'origin/feature/changed_include_paths' into development
# Conflicts:
# include/etl/version.h
|
2018-07-28 21:55:27 +01:00 |
|
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 |
|