Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Conflicts:
	applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
This commit is contained in:
laurence
2012-03-27 12:41:27 +01:00
83 changed files with 3059 additions and 186 deletions

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -486,7 +486,7 @@ int main(int argc, char *argv[])
"word",
"name of dictionary to provide feature extraction information"
);
# include "setRootCase.H"
# include "createTime.H"