Tom Lin 50fe7c102a Merge branch 'develop' into option_for_vec ... # Conflicts: # src/kokkos/KokkosStream.hpp # src/kokkos/model.cmake		2023-06-28 19:02:24 +01:00
..
KokkosStream.cpp	Merge branch 'develop' into option_for_vec	2023-06-28 19:02:24 +01:00
KokkosStream.hpp	Fix compatibility with Kokkos 4+	2023-06-10 21:08:29 +01:00
model.cmake	Merge branch 'develop' into option_for_vec	2023-06-28 19:02:24 +01:00