Skip to content
Snippets Groups Projects
Commit fbe04b18 authored by mattijs's avatar mattijs
Browse files

Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev 

Conflicts:
	src/parallel/decompose/scotchDecomp/scotchDecomp.C
parents 9f8b5bb6 28b1a9e2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 117 additions and 163 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment