Skip to content
Snippets Groups Projects
Commit 90eacc25 authored by Kutscher's avatar Kutscher
Browse files

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

# Conflicts:
#	src/cpu/simulationconfig/Simulation.cpp
#	src/cpu/simulationconfig/Simulation.h
parents a681a89d e5ed4e5d
No related branches found
No related tags found
1 merge request!240fix UbSystem::makeDirectory() for Linux
Showing
with 3 additions and 1503 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