Skip to content
Snippets Groups Projects
Commit e2d55d86 authored by sergio's avatar sergio
Browse files

Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

Conflicts:
	applications/solvers/lagrangian/reactingParcelFilmPyrolysisFoam/Make/options
parents 64c9989d cc7376fd
Branches
Tags
Showing
with 50 additions and 41 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