Skip to content
Snippets Groups Projects
Commit f2c6bd7b authored by TESLA03\Master's avatar TESLA03\Master
Browse files

Merge branch 'develop' into MasterAnna 

# Conflicts:
#	gpu.cmake
#	src/gpu/VirtualFluids_GPU/GPU/CalcMac27.cu
parents 22385c25 338e876c
No related branches found
No related tags found
1 merge request!104Add Communication Hiding to GPU version
Hide whitespace changes
Inline Side-by-side
Showing
with 154 additions and 211 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