Merge branch 'master' into cvm

Conflicts:
	applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
This commit is contained in:
graham
2010-05-11 13:00:25 +01:00
1478 changed files with 24877 additions and 13760 deletions

View File

@ -18,11 +18,11 @@ FoamFile
Documentation
{
docBrowser "kde-open %f";
docBrowser "firefox %f";
doxyDocDirs
(
"$WM_PROJECT_USER_DIR/Doxygen/html"
"~OpenFOAM/Doxygen/html"
"$WM_PROJECT_USER_DIR/html"
"~OpenFOAM/html"
"$WM_PROJECT_DIR/doc/Doxygen/html"
);
doxySourceFileExts