Andrew Heather c909a5df25 GIT: resolved merge conflict

2018-06-13 14:20:18 +01:00

..

combustionModel

Merge remote-tracking branch 'origin/develop' into develop-pre-release

2018-05-31 17:34:16 +01:00

CombustionModel

STYLE: consistent use of '= delete'

2018-05-30 12:03:17 +02:00

diffusion

Merge remote-tracking branch 'origin/develop' into develop-pre-release

2018-05-31 17:34:16 +01:00

diffusionMulticomponent

Merge remote-tracking branch 'origin/develop' into develop-pre-release

2018-05-31 17:34:16 +01:00

doc

ENH: (further) Doxygen documentation updates for module support

2016-06-27 20:34:19 +01:00

EDC

Merge remote-tracking branch 'origin/develop' into develop-pre-release

2018-05-31 17:34:16 +01:00

eddyDissipationDiffusionModel

Merge remote-tracking branch 'origin/develop' into develop-pre-release

2018-05-31 17:34:16 +01:00

eddyDissipationModelBase

GIT: resolved merge conflict

2018-06-13 14:20:18 +01:00

FSD

Merge remote-tracking branch 'origin/develop' into develop-pre-release

2018-05-31 17:34:16 +01:00

infinitelyFastChemistry

Merge remote-tracking branch 'origin/develop' into develop-pre-release

2018-05-31 17:34:16 +01:00

laminar

Merge remote-tracking branch 'origin/develop' into develop-pre-release

2018-05-31 17:34:16 +01:00

Make

ENH: combustionModels: Changed the construction order

2017-11-23 16:57:12 +00:00

noCombustion

Merge remote-tracking branch 'origin/develop' into develop-pre-release

2018-05-31 17:34:16 +01:00

PaSR

Merge remote-tracking branch 'origin/develop' into develop-pre-release

2018-05-31 17:34:16 +01:00

singleStepCombustion

GIT: resolved merge conflict

2018-06-13 14:20:18 +01:00

zoneCombustion

Merge remote-tracking branch 'origin/develop' into develop-pre-release

2018-05-31 17:34:16 +01:00