Commit graph

8 commits

Author SHA1 Message Date
Martin Beaudoin
c0dfe0d15c ThirdParty packages: fixing typo 2013-07-04 11:45:58 -04:00
Henrik Rusche
09fbf2ef28 Fixes to previous merge commits 2013-07-03 19:43:31 +02:00
Henrik Rusche
031d180f63 Merge branch 'hotfix/gcc47_HR' into nextRelease
Conflicts:
	src/OpenFOAM/fields/PointPatchFields/constraint/processor/ProcessorPointPatchField.C
	src/OpenFOAM/fields/PointPatchFields/derived/global/GlobalPointPatchField.C
2013-07-03 17:19:52 +02:00
Henrik Rusche
e394390d8f Merge branch 'HJ/AdjointImmersedBoundary' into masterSF
Conflicts:
	ThirdParty/AllMake.stage1
	ThirdParty/AllMake.stage4
	ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0
	ThirdParty/rpmBuild/SPECS/ParaView-3.12.0.spec
	ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec
	ThirdParty/rpmBuild/SPECS/mesquite-2.1.2.spec
	ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.7.4.spec
	etc/prefs.csh-EXAMPLE
	etc/prefs.sh-EXAMPLE
	etc/settings.csh
	etc/settings.sh
	src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
	src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.C
	src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.C
	src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/reconCentral/reconCentral.C
	testHarness/OSIG/Turbomachinery/README.txt
	testHarness/OpenFOAM/1.6-ext/CMakeFiles/CMakeLists.txt
2013-07-03 15:11:21 +02:00
Henrik Rusche
2ac4e0a4d7 Changes for gcc 4.7 on Ubuntu 12.10 2013-01-08 18:03:41 +01:00
Hrvoje Jasak
d280b12a93 Project update 2012-08-30 17:35:14 +01:00
Martin Beaudoin
1455422a0a ThirdParty: add missing files for ParaView-3.12.0. Move QT to version 4.7.4 2012-05-10 11:56:29 -04:00
Hrvoje Jasak
9685b52873 Paraview-3.12 2012-01-29 12:06:18 +00:00