graham c1925b36e8 Fixing conflict.

2009-09-15 15:24:33 +01:00

..

basic

updated version numbers to 1.6

2009-07-23 12:22:48 +01:00

combustion

Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

2009-08-19 16:43:40 +01:00

compressible

Added basic support for thermal effects in porous zones.

2009-09-09 21:55:55 +01:00

discreteMethods

Cleanup.

2009-09-09 21:56:07 +01:00

DNS/dnsFoam/boxTurb16

updated version numbers to 1.6

2009-07-23 12:22:48 +01:00

electromagnetics

updated version number dev->1.6

2009-08-03 16:38:20 +01:00

financial/financialFoam/europeanCall

updated version numbers to 1.6

2009-07-23 12:22:48 +01:00

heatTransfer

Removed spurious "compressible::".

2009-08-18 22:03:34 +01:00

incompressible

Added "value" to wall BCs.

2009-09-13 23:11:28 +01:00

lagrangian

Merge branch 'master' into particleInteractions

2009-09-03 10:49:37 +01:00

mesh

Added comment.

2009-08-28 17:55:03 +01:00

multiphase

Removed unnecessary and inconsistent entries.

2009-09-10 22:43:06 +01:00

stressAnalysis

updated version number dev->1.6

2009-08-03 16:38:20 +01:00

Allclean

finally drop references to ~/.OpenFOAM-<ver> (use ~/.OpenFOAM/<ver>)

2009-05-07 10:37:55 +02:00

Allrun

finally drop references to ~/.OpenFOAM-<ver> (use ~/.OpenFOAM/<ver>)

2009-05-07 10:37:55 +02:00

Alltest

finally drop references to ~/.OpenFOAM-<ver> (use ~/.OpenFOAM/<ver>)

2009-05-07 10:37:55 +02:00