mattijs 6d75041480 Merge remote-tracking branch 'origin/develop' into feature-regionModels ...

Conflicts:
	src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C

2015-12-11 15:12:15 +00:00

..

basic

GIT: Resolved conflict

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

combustion

Merge branch 'develop' into radiation

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

compressible

GIT: Resolved conflict

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

discreteMethods

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

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

DNS/dnsFoam/boxTurb16

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

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

electromagnetics

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

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

financial/financialFoam/europeanCall

GIT: Resolved conflict

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

heatTransfer

Merge branch 'develop' into radiation

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

incompressible

GIT: Resolved conflict

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

lagrangian

Merge remote-tracking branch 'origin/develop' into feature-regionModels

2015-12-11 15:12:15 +00:00

mesh

GIT: Resolved conflict

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

multiphase

GIT: Resolved conflict

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

preProcessing/createZeroDirectory

GIT: Resolved conflict

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

resources/geometry

GIT: Repo update

2014-12-11 08:35:10 +00:00

stressAnalysis

GIT: Resolved conflict

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

Allclean

Minor change to comment

2014-12-14 21:50:14 +00:00

Allrun

Minor change to comment

2014-12-14 21:50:14 +00:00

Alltest

Updated headers

2015-07-15 21:58:29 +01:00