Merge branch 'master' of /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

Conflicts:
	tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
	tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict
This commit is contained in:
mattijs
2014-01-24 15:21:54 +00:00

View File

@ -24,7 +24,7 @@ actions
source patchToFace;
sourceInfo
{
name outerCylinder;
name innerCylinder;
}
}