Skip to content
Snippets Groups Projects
Commit 7b0d42c8 authored by Martin Schönherr's avatar Martin Schönherr :speech_balloon:
Browse files

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

# Conflicts:
#	src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu
parents c4c1e4cf b5b41477
No related branches found
No related tags found
Loading
Showing
with 2624 additions and 2788 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment