| commit | f5edc2606cd83e730264450c8010578da09b005d | |
| author | Michael Wild <themiwi@users.sourceforge.net> | |
| Sun, 22 Mar 2009 11:07:09 +0000 (22 12:07 +0100) | ||
| committer | Michael Wild <themiwi@users.sourceforge.net> | |
| Sun, 22 Mar 2009 11:09:33 +0000 (22 12:09 +0100) | ||
| tree | 676a7063ca9ec72a95e3b11883de91812b7bb0db | treesnapshot (tar.gz zip) |
| parent | 100b241bb343f41da9bb668854ee75395ac6482b | commitdiff |
| parent | bee68c45fc8bd25e75ed2fc300633051b972bee2 | commitdiff |
Merge branch 'upstream' into master
Conflicts:
applications/utilities/mesh/generation/blockMesh/blockPoints.C
applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
etc/bashrc
etc/cshrc
etc/settings.csh
etc/settings.sh
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H
src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
src/meshTools/searchableSurface/triSurfaceMesh.C
src/meshTools/searchableSurface/triSurfaceMesh.H
src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H
Merged by removing scripts from etc/bashrc and fixing #include
statements.
Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
Conflicts:
applications/utilities/mesh/generation/blockMesh/blockPoints.C
applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
etc/bashrc
etc/cshrc
etc/settings.csh
etc/settings.sh
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.H
src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
src/meshTools/searchableSurface/triSurfaceMesh.C
src/meshTools/searchableSurface/triSurfaceMesh.H
src/postProcessing/fieldAverage/fieldAverage/fieldAverage.H
Merged by removing scripts from etc/bashrc and fixing #include
statements.
Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
29 files changed: