andy 69ae5a9a78 GIT: Resolve merge conflict

2016-04-22 13:31:37 +01:00

..

basic

ENH: Adding fvOption constrain to scalarTransportFoam.

2016-01-04 14:12:49 -08:00

combustion

GIT: Resolved conflict

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

compressible

ENH: Provides support for laminar models for hoSimpleFoam

2016-04-11 10:54:59 -07:00

discreteMethods

ENH: Solvers - updated group documentation

2015-12-03 22:05:55 +00:00

DNS

ENH: Solvers - updated group documentation

2015-12-03 22:05:55 +00:00

doc

ENH: Solvers - updated group documentation

2015-12-03 22:05:55 +00:00

electromagnetics

Merge branch 'master' of develop.openfoam.com:Development/OpenFOAM-plus into feature-shared-file

2016-01-25 16:29:04 +00:00

financial

ENH: Solvers - updated group documentation

2015-12-03 22:05:55 +00:00

heatTransfer

GIT: Resolve merge conflict

2016-04-22 13:31:37 +01:00

incompressible

GIT: Resolved conflict

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

lagrangian

Merge branch 'master' of develop.openfoam.com:Development/OpenFOAM-plus into feature-shared-file

2016-01-25 16:29:04 +00:00

multiphase

Merge remote-tracking branch 'origin/develop' into feature-shared-file

2016-03-09 14:38:34 +00:00

stressAnalysis

GIT: Resolved conflict

2015-12-09 09:32:38 +00:00