Skip to content
Snippets Groups Projects
Commit 0a0d4c8e authored by AlenaKaranchuk's avatar AlenaKaranchuk
Browse files

Merge branch 'NewPhaseField' of... 

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

# Conflicts:
#	apps/cpu/ViskomatXL/viskomat.cfg
Fix RestartCoProcessor and MigrationCoProcessor
parents 6629d11e aaac6dd2
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1915 additions and 1479 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