tree 57ccc212037afec0c2d2b22d4bc59f208e0fe931
parent 30b84395a16b5cc54f16ee2dc11d5d1a22e0d0a9
parent dcac3b451da7ae2681680181c6efee2adcf3726a
author Adam Sawicki <adam.sawicki@amd.com> 1638352995 +0100
committer Adam Sawicki <adam.sawicki@amd.com> 1638352995 +0100

Merge branch 'master' into development

# Conflicts:
#	CMakeLists.txt
#	src/CMakeLists.txt
#	src/Doxyfile