Skip to content
Snippets Groups Projects
Commit 39914ff1 authored by LEGOLAS\lenz's avatar LEGOLAS\lenz
Browse files

Merge branch 'findOffsets' into feature/merging_with_VF_GPU 

# Conflicts:
#	src/GridGenerator/grid/BoundaryConditions/Side.cpp
#	src/GridGenerator/grid/GridBuilder/LevelGridBuilder.cpp
#	src/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp
#	src/VirtualFluids_GPU/LBM/Simulation.cpp
#	src/VirtualFluids_GPU/Output/FileWriter.cpp
#	targets/apps/HULC/main.cpp
parents c8550464 8577d53e
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 688 additions and 456 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