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

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

Conflicts:
	etc/settings.csh
	etc/settings.sh
	src/parallel/decompose/Allwmake
parents 9f5c39af fe083ad9
Branches
Tags
No related merge requests found
Showing with 488 additions and 363 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