zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'origin/master' into splitCyclic

Browse Source 
Conflicts:
	applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
	applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C
	src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C
	src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C
	src/dynamicMesh/motionSmoother/motionSmoother.C
	src/dynamicMesh/motionSmoother/motionSmoother.H
	src/dynamicMesh/motionSmoother/motionSmootherTemplates.C
This commit is contained in:
mattijs
2010-05-18 13:28:21 +01:00
parent bba50b2152 2e418fec9e
commit f84a91d7ce
480 changed files with 13145 additions and 5249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wmake/src/wmkdependParser.cpp
View File

@ -204,8 +204,6 @@ void Parser::importDir(const std::string& name)
//! @cond fileScope
//
//
// Create by copying str - only used locally
inline static wchar_t* coco_string_create(const wchar_t* str)
@ -225,7 +223,7 @@ inline static void coco_string_delete(wchar_t* &str)
str = NULL;
}
//
//! @endcond fileScope
//! @endcond
// ----------------------------------------------------------------------------