Merge branch 'master' into cvm

Conflicts:
	applications/test/Distribution/DistributionTest.C
	applications/test/Distribution/Make/options
	src/OpenFOAM/containers/Lists/Distribution/Distribution.C
	src/OpenFOAM/containers/Lists/Distribution/Distribution.H
	src/OpenFOAM/containers/Lists/Distribution/DistributionI.H
This commit is contained in:
graham
2011-01-19 10:32:36 +00:00
4607 changed files with 5363 additions and 5559 deletions

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License