mattijs 92b5ee3487 Merge branch 'develop' into radiation ...

Conflicts:
	applications/utilities/preProcessing/viewFactorsGen/shootRays.H
	src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
	src/thermophysicalModels/radiation/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C
	src/thermophysicalModels/radiation/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H
	src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
	src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
	tutorials/mesh/parallel/filter/0.org/T

2015-12-11 09:50:43 +00:00

..

coalChemistryFoam/simplifiedSiwek

Merge branch 'develop' into radiation

2015-12-11 09:50:43 +00:00

DPMFoam/Goldschmidt

STYLE: Updated links from openfoam.org to openfoam.com

2015-12-09 15:03:05 +00:00

icoUncoupledKinematicParcelFoam/hopper

GIT: Resolved conflict

2015-12-09 16:19:28 +00:00

MPPICFoam

STYLE: Updated links from openfoam.org to openfoam.com

2015-12-09 15:03:05 +00:00

reactingParcelFilmFoam

GIT: Resolved conflict

2015-12-09 16:19:28 +00:00

reactingParcelFoam

GIT: Resolved conflict

2015-12-09 16:19:28 +00:00

simpleReactingParcelFoam/verticalChannel

GIT: Resolved conflict

2015-12-09 16:19:28 +00:00

sprayFoam/aachenBomb

GIT: Resolved conflict

2015-12-09 16:19:28 +00:00