John Wellbelove
|
7ca0b12583
|
Merge remote-tracking branch 'origin/development'
# Conflicts:
# include/etl/private/to_string_helper.h
# include/etl/version.h
# support/Release notes.txt
# test/test_to_string.cpp
# test/test_to_u16string.cpp
# test/test_to_u32string.cpp
# test/test_to_wstring.cpp
|
2019-04-16 18:13:37 +01:00 |
|
John Wellbelove
|
30fe51a240
|
Merge remote-tracking branch 'origin/development'
# Conflicts:
# include/etl/to_string.h
# include/etl/to_u16string.h
# include/etl/to_u32string.h
# include/etl/to_wstring.h
# support/Release notes.txt
|
2019-04-15 19:39:39 +01:00 |
|
John Wellbelove
|
365c719fbf
|
Merge remote-tracking branch 'origin/development'
# Conflicts:
# include/etl/basic_format_spec.h
# include/etl/private/to_string_helper.h
# include/etl/to_string.h
# include/etl/to_u16string.h
# include/etl/to_u32string.h
# include/etl/to_wstring.h
# include/etl/version.h
# support/Release notes.txt
|
2019-04-14 19:43:09 +01:00 |
|
John Wellbelove
|
8d46963bb0
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# include/etl/format_spec.h
# include/etl/private/to_string_helper.h
# include/etl/to_string.h
# include/etl/to_u16string.h
# include/etl/to_u32string.h
# include/etl/to_wstring.h
# include/etl/version.h
# support/Release notes.txt
# test/test_to_string.cpp
# test/test_to_u16string.cpp
# test/test_to_u32string.cpp
# test/test_to_wstring.cpp
# test/vs2017/etl.vcxproj.filters
|
2019-04-09 08:21:28 +01:00 |
|
John Wellbelove
|
7844142c19
|
Merge remote-tracking branch 'origin/feature/to_string' into development
# Conflicts:
# include/etl/version.h
# support/Release notes.txt
# test/vs2017/etl.vcxproj.filters
|
2019-04-08 19:37:41 +01:00 |
|