Merge commit 'bundle/home' into olesenm

Conflicts:
	src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.C
	src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.H
	tutorials/incompressible/simpleFoam/airFoil2D/Allclean
	tutorials/multiphase/settlingFoam/ras/tank3D/Allclean
This commit is contained in:
Mark Olesen
2009-11-04 08:54:34 +01:00
106 changed files with 3673 additions and 229 deletions

View File

@ -3,4 +3,4 @@
# Clean time folders only
rm -rf *[1-9]*
rm -f log.*
rm -f log.* 2>/dev/null