Skip to content
Snippets Groups Projects
Commit 70250b38 authored by Soeren Peters's avatar Soeren Peters
Browse files

Merge branch 'open_source' into develop

# Conflicts:
#	.gitattributes
#	apps/cpu/Applications.cmake
#	apps/cpu/LidDrivenCavity/LidDrivenCavity.cpp
#	cpu.cmake
#	gpu.cmake
#	src/cpu/VirtualFluids.h
#	src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.cpp
#	src/cpu/VirtualFluidsCore/CMakeLists.txt
#	src/cpu/VirtualFluidsCore/Parallel/NullCommunicator.h
parents 72231aca a6172a6f
No related branches found
No related tags found
No related merge requests found
Showing
No files found.
with 0 additions and 0 deletions
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