John Wellbelove 0d5f30b97e Merge branch 'master' into feature/bip-buffer-spsc-atomic ... # Conflicts: # test/vs2019/etl.vcxproj.filters		2021-08-02 12:22:01 +01:00
..
CMakeLists.txt	Merge branch 'master' into feature/bip-buffer-spsc-atomic	2021-08-02 12:22:01 +01:00
etl_profile.h	Merge branch 'feature/C++98/03_compatibilty' into feature/c++98-03-compatibilty	2021-03-14 14:40:00 +00:00