Skip to content
Snippets Groups Projects
Commit e93e8e91 authored by Hkorb's avatar Hkorb
Browse files

Merge branch 'python_bindings' into 'amd'

# Conflicts:
#   src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.h
parents 441ba379 f57fdfec
1 merge request!84Python bindings, amd, actuator line
Showing
with 179 additions and 43 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