Skip to content
Snippets Groups Projects
Commit 43c1bcae authored by Mark Olesen's avatar Mark Olesen
Browse files

Merge commit 'OpenCFD/master' into olesenm

Conflicts:

	src/Allwmake
	src/OpenFOAM/global/global.C
	wmake/rules/General/version

Retained solution with global.Cver
parents a15d0f8a 5bda264b
Branches
Tags
Showing
with 1011 additions and 119 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