Serge Rabyking 5e5ae997f5 Merge branch 'devel' into 'serge/changes' ... # Conflicts: # bootstrap/cmake_modules/FindBootstrap.cmake		2023-06-28 15:56:29 +00:00
..
cmake_modules	include/coriolis -> include/coriolis2	2021-08-27 16:15:28 +00:00
src	Merge branch 'devel' into 'serge/changes'	2023-06-28 15:56:29 +00:00
CMakeLists.txt	CI build fix	2023-05-30 21:02:07 +01:00