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
..
dataConversion	Merge remote branch 'OpenCFD/master' into olesenm	2010-12-21 10:19:53 +01:00
foamCalc	STYLE: Fixing code style requirements for all apps.	2010-07-27 15:27:05 +01:00
graphics	ENH: use memInfo instead of parsing meminfo ourselves	2010-11-26 13:29:34 +01:00
lagrangian	Revert "ENH: updates to Xfer after commit 49331bf9176d17"	2010-11-24 10:55:23 +00:00
miscellaneous	Merge remote branch 'OpenCFD/master' into olesenm	2010-12-21 10:19:53 +01:00
patch	Merge commit 'origin/master' into splitCyclic	2010-05-18 13:28:21 +01:00
sampling	ENH: sampledSet, sampledSurface : remove default value for interpolation scheme and writer	2010-12-08 11:51:45 +00:00
scalarField/pPrime2	STYLE: Fixing code style requirements for all apps.	2010-07-27 15:27:05 +01:00
stressField/stressComponents	STYLE: Fixing code style requirements for all apps.	2010-07-27 15:27:05 +01:00
turbulence	COMP: avoid ambiguous construct from tmp - utils/ pre+post processing	2010-12-20 10:37:17 +01:00
velocityField	COMP: avoid ambiguous construct from tmp - test/ utils/	2010-12-21 09:46:55 +01:00
wall	COMP: avoid ambiguous construct from tmp - utils/ pre+post processing	2010-12-20 10:37:17 +01:00