Skip to content
Snippets Groups Projects
Commit 0fd519d4 authored by Soeren Peters's avatar Soeren Peters
Browse files

Merge branch 'develop' of https://git.rz.tu-bs.de/irmb/VirtualFluids_dev into develop

parents f4908112 4513e369
No related branches found
No related tags found
1 merge request!9Fixed CMake Cuda workaround and merge conflict error.
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1762 additions and 223 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment