Merge commit 'bd947865f2881af1c52b458aa6b6b1b1844ce254' into nextRelease
commit6661bc2412765b18bab6a62e8c42faa52969096a
authorHrvoje Jasak <h.jasak@wikki.co.uk>
Wed, 13 May 2015 17:27:51 +0000 (13 18:27 +0100)
committerHrvoje Jasak <h.jasak@wikki.co.uk>
Wed, 13 May 2015 17:27:51 +0000 (13 18:27 +0100)
treea8c00ada7e6724531f4083592e3eeaea6ab94678
parentdb3923787eaec89ebd9e2f28b7087b71994b1907
parentbd947865f2881af1c52b458aa6b6b1b1844ce254
Merge commit 'bd947865f2881af1c52b458aa6b6b1b1844ce254' into nextRelease

Conflicts:
ListOfContributors
applications/solvers/compressible/sonicDyMFoam/eEqn.H
applications/utilities/immersedBoundary/refineImmersedBoundaryMesh/Make/options
src/coupledMatrix/coupledLduMatrix/coupledLduMatrix.C
src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/coupledMesh/dynamicTopoFvMeshCoupled.C
src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchScalarField.C
src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.H
src/foam/fields/PointPatchFields/constraint/processor/ProcessorPointPatchField.C
src/foam/interpolations/GGIInterpolation/GGIInterpolationQuickRejectTests.C
src/foam/matrices/blockLduMatrix/BlockAmg/coarseBlockAmgLevel.C
src/foam/meshes/polyMesh/globalMeshData/globalMeshData.H
src/lduSolvers/amg/coarseAmgLevel.C
src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/objectRefinement.C
src/Pstream/mpi/Pstream.C
src/coupledMatrix/coupledLduMatrix/coupledLduMatrix.C
src/dbns/multigrid/mgMeshLevel/mgMeshLevel.C
src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/coupledMesh/dynamicTopoFvMeshCoupled.C
src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchScalarField.C
src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
src/foam/Make/files
src/foam/interpolations/GGIInterpolation/GGIInterpolationQuickRejectTests.C
src/foam/matrices/blockLduMatrix/BlockAmg/coarseBlockAmgLevel.C
src/foam/meshes/primitiveShapes/triangle/triangleI.H