Skip to content
Snippets Groups Projects
Commit a78222d0 authored by Kutscher's avatar Kutscher
Browse files

Merge branch 'develop' into Refactoring2

# Conflicts:
#	src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyVelocityBCAlgorithm.cpp
parents 847a3646 ded22784
No related branches found
No related tags found
1 merge request!225Refactoring of CPU code
Showing
with 689 additions and 49 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