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

Merge branch 'LIGGGHTS_coupling' into develop 

# Conflicts:
#	apps/cpu/Applications.cmake
#	src/cpu/VirtualFluidsCore/CMakeLists.txt
parents ca34ed61 e9c37a71
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 2189 additions and 27 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