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

Merge branch 'LIGGGHTS_coupling' into develop 

# Conflicts:
# apps/cpu/Applications.cmake
# apps/cpu/ViskomatXL/viskomat.cfg
parent b2194eba
2 merge requests!171Newest Update,!83Fix MPICommunicator
Hide whitespace changes
Inline Side-by-side
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