|
|
badaa01deb
|
Merge remote-tracking branch 'origin/master' into concurrent
# Conflicts:
# lib/main/thread/pithreadpoolexecutor.cpp
# lib/main/thread/pithreadpoolexecutor.h
# tests/concurrent/ExecutorIntegrationTest.cpp
# tests/concurrent/ExecutorUnitTest.cpp
# tests/concurrent/testutil.h
|
2020-08-03 10:18:52 +03:00 |
|
