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
..
errorEstimation	COMP: avoid ambiguous construct from tmp - utils/ error estimation	2010-12-17 18:56:39 +01:00
mesh	Merge remote branch 'OpenCFD/master' into olesenm	2010-12-21 10:19:53 +01:00
miscellaneous	ENH: new basicSolidThermo, solid -> pointSolid and solidMixture ->	2010-12-08 16:20:43 +00:00
parallelProcessing	Merge remote branch 'OpenCFD/master' into olesenm	2010-12-21 10:19:53 +01:00
postProcessing	Merge remote branch 'OpenCFD/master' into olesenm	2010-12-21 10:19:53 +01:00
preProcessing	COMP: NamedEnum specialization within 'Foam' namespace only	2010-12-20 14:27:03 +01:00
surface	Merge remote branch 'OpenCFD/master' into olesenm	2010-12-21 10:19:53 +01:00
thermophysical	ENH: Updated chemkinToFoam utility to make use of new dict output	2010-10-13 17:58:09 +01:00