This repository has been archived on 2023-11-20. You can view files and clone it, but cannot push or open issues or pull requests.
foam-extend4.1-coherent-io/src/finiteArea/fields
Hrvoje Jasak f3441a1a31 Merge branch 'macMaverickPort' into nextRelease
Conflicts:
	applications/solvers/solidMechanics/solidModels/Make/files
	applications/solvers/solidMechanics/solidModels/contactModel/contactPatchPair.C
	applications/solvers/solidMechanics/solidModels/contactModel/contactPatchPairCorrect.C
	applications/solvers/solidMechanics/solidModels/contactModel/contactProblem.C
	applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedDisplacementZeroShear/fixedDisplacementZeroShearFvPatchVectorField.C
	src/Allwmake
	src/solidModels/fvPatchFields/fixedDisplacementZeroShear/fixedDisplacementZeroShearFvPatchVectorField.H
	src/solidModels/fvPatchFields/solidTraction/solidTractionFvPatchVectorField.C
	src/solidModels/fvPatchFields/solidTraction/solidTractionFvPatchVectorField.H
	src/solidModels/fvPatchFields/solidTractionFree/solidTractionFreeFvPatchVectorField.C
	src/solidModels/fvPatchFields/solidTractionFree/solidTractionFreeFvPatchVectorField.H
	src/solidModels/fvPatchFields/timeVaryingSolidTraction/timeVaryingSolidTractionFvPatchVectorField.C
2013-11-04 09:57:50 +00:00
..
areaFields Mac OS X Maverick port 2013-11-03 20:28:05 +00:00
edgeFields Mac OS X Maverick port 2013-11-03 20:28:05 +00:00
faePatchFields Mac OS X Maverick port 2013-11-03 20:28:05 +00:00
faPatchFields Merge branch 'macMaverickPort' into nextRelease 2013-11-04 09:57:50 +00:00