Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

etc/bashrc

etc/config/aliases.sh

etc/config/settings.sh

...ieldSources/basicSource/rotorDiskSource/rotorDiskSource.C

...ieldSources/basicSource/rotorDiskSource/rotorDiskSource.H

...eldSources/basicSource/rotorDiskSource/rotorDiskSourceI.H

...e/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C

...e/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H

...rangian/spray/parcels/Templates/SprayParcel/SprayParcel.C

src/postProcessing/functionObjects/field/Make/files

...cts/field/regionSizeDistribution/regionSizeDistribution.C

...cts/field/regionSizeDistribution/regionSizeDistribution.H

...onSizeDistribution/regionSizeDistributionFunctionObject.C

...onSizeDistribution/regionSizeDistributionFunctionObject.H

src/turbulenceModels/incompressible/LES/Make/files