Skip to content
Snippets Groups Projects
Commit 108a6184 authored by niikonst's avatar niikonst
Browse files

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

Conflicts:
	apps/cpu/RisingBubble2D/RisingBubble2D.cpp
parents 4cafd7ef 2d5b026e
No related branches found
No related tags found
2 merge requests!171Newest Update,!83Fix MPICommunicator
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 924 additions and 675 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