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

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

# Conflicts:
#	CMake/cmake_config_files/BOMBADIL.config.cmake
#	src/cpu/VirtualFluidsCore/CMakeLists.txt
#	src/cpu/VirtualFluidsCore/LBM/D3Q27System.h
#	src/lbm/constants/D3Q27.h
parents e58a8875 1aebbd6e
No related branches found
No related tags found
1 merge request!171Newest Update
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 88 additions and 6996 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