openfoam/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid
Mark Olesen 881b3dafa2 Merge remote branch 'OpenCFD/master' into olesenm
Conflicts:
	applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
	applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh.C
	applications/utilities/surface/surfaceCheck/surfaceCheck.C
	src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
	src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
	src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C

NOTE: also needed to strip trailing space/lines in various files
2010-12-21 10:19:53 +01:00
..
changeDictionaryDict Merge remote branch 'OpenCFD/master' into olesenm 2010-12-21 10:19:53 +01:00
decomposeParDict Corrected headers. 2010-06-23 16:54:54 +01:00
fvSchemes Corrected headers. 2010-06-23 16:54:54 +01:00
fvSolution Changed E to e in scalars 2010-11-03 11:34:34 +00:00