Skip to content
Snippets Groups Projects
Commit 65c8d647 authored by Konstantin Kutscher's avatar Konstantin Kutscher
Browse files

Merge branch 'SharedPtrAndForwardDeclaration' 

# Conflicts:
#	source/Applications/DLR-F16-Solid/f16.cpp
#	source/VirtualFluidsCore/Visitors/SpongeLayerBlockVisitor.cpp
#	source/VirtualFluidsCore/Visitors/SpongeLayerBlockVisitor.h
parents b781d0be 02e1107b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 114 additions and 102 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