coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-11-09 22:59:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/development'

Browse Source 
# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
#	test/vs2017/etl.vcxproj.filters
This commit is contained in:
John Wellbelove 2019-04-27 16:15:37 +01:00
parent d084fe9969
commit 42c3ee4938
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/codeblocks/ETL.cbp
View File

@ -231,6 +231,7 @@
<Unit filename="../../include/etl/message_router_generator.h" />
<Unit filename="../../include/etl/message_timer.h" />
<Unit filename="../../include/etl/message_types.h" />
<Unit filename="../../include/etl/multi_array.h" />
<Unit filename="../../include/etl/multimap.h" />
<Unit filename="../../include/etl/multiset.h" />
<Unit filename="../../include/etl/murmur3.h" />
@ -397,6 +398,7 @@
<Unit filename="../test_message_bus.cpp" />
<Unit filename="../test_message_router.cpp" />
<Unit filename="../test_message_timer.cpp" />
<Unit filename="../test_multi_array.cpp" />
<Unit filename="../test_multimap.cpp" />
<Unit filename="../test_multiset.cpp" />
<Unit filename="../test_murmur3.cpp" />