Skip to content
Snippets Groups Projects
Commit 7ee13703 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:
	.gitignore
	apps/cpu/JetBreakup/JetBreakup.cpp
parents ad67cbf4 94279d1a
No related branches found
No related tags found
1 merge request!269Implements Sharp Interface
Showing
with 380 additions and 299 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