Commit graph

26 commits

Author SHA1 Message Date
Dominik Christ
e556e92338 Merge remote-tracking branch 'origin/hotfix/multiRegion_dynamicFvMesh' into nextRelease 2013-07-08 13:46:54 +01:00
Dominik Christ
4cb66395da Merge remote-tracking branch 'origin/hotfix/cyclic_and_cyclicGgi_position_of_patch_faces' into nextRelease 2013-07-08 13:45:45 +01:00
Dominik Christ
090c07f3a7 Merge remote-tracking branch 'origin/feature/overlapGgi' into nextRelease
Conflicts:
	src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/NVDTVD.H
	src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/NVDVTVDV.H
	src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/vanAlbada/vanAlbada.H
2013-07-08 13:42:18 +01:00
Dominik Christ
09d858c106 Merge remote-tracking branch 'origin/hotfix/ThirdParty_documentation' into nextRelease 2013-07-08 13:32:02 +01:00
Dominik Christ
654e6811ca Merge remote-tracking branch 'origin/feature/equationReader' into nextRelease 2013-07-08 13:02:07 +01:00
Dominik Christ
aab85044e9 Merge remote-tracking branch 'origin/hotfix/bound_BC' into nextRelease 2013-07-08 13:00:58 +01:00
Dominik Christ
9eef2d503a Merge remote-tracking branch 'origin/feature/buildInstructions' into nextRelease
Conflicts:
	doc/buildInstructions/Centos/5.5/Compilation_Centos_5.5_64bit.txt
	doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_32-bit.txt
	doc/buildInstructions/Ubuntu/10.04/Compilation_Ubuntu_10.04.3_64-bit.txt
2013-07-08 12:57:09 +01:00
Dominik Christ
2344c8c728 Merge remote-tracking branch 'origin/feature/solidMechanics' into nextRelease 2013-07-08 12:54:52 +01:00
Dominik Christ
8a70870771 Merge remote-tracking branch 'origin/hotfix/ggiSeparation+blockCoupledGgi' into nextRelease
Conflicts:
	src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.H
2013-07-08 12:05:49 +01:00
Dominik Christ
e72ecd6fcf Merge remote-tracking branch 'origin/proposal/famTutorialReorganization' into nextRelease 2013-07-08 11:52:32 +01:00
Henrik Rusche
a0638c3c25 Changes to gitignores (Typo & Thridparty/packages) 2013-07-05 17:22:39 +02:00
Martin Beaudoin
e36fd33444 .gitignore: blacklisting files subject to a DMCA complaint by ANSYS 2013-05-31 00:32:39 -04:00
Martin Beaudoin
01fd2c8fbd .gitignore: blacklisting files subject to a DMCA complaint by ANSYS 2013-05-31 00:32:19 -04:00
Martin Beaudoin
437e75704c .gitignore: blacklisting files subject to a DMCA complaint by ANSYS 2013-05-31 00:32:16 -04:00
Martin Beaudoin
738afcda63 .gitignore: blacklisting files subject to a DMCA complaint by ANSYS 2013-05-31 00:32:11 -04:00
Martin Beaudoin
5d62225158 .gitignore: blacklisting files subject to a DMCA complaint by ANSYS 2013-05-31 00:32:06 -04:00
Martin Beaudoin
c260d423bd .gitignore: blacklisting files subject to a DMCA complaint by ANSYS 2013-05-31 00:32:04 -04:00
Martin Beaudoin
131e8dae1e .gitignore: blacklisting files subject to a DMCA complaint by ANSYS 2013-05-31 00:32:03 -04:00
Martin Beaudoin
3e97576acc .gitignore: blacklisting files subject to a DMCA complaint by ANSYS 2013-05-31 00:31:53 -04:00
Martin Beaudoin
205c2e90f7 .gitignore: blacklisting files subject to a DMCA complaint by ANSYS 2013-05-31 00:31:39 -04:00
Martin Beaudoin
6048822fcc .gitignore: blacklisting files subject to a DMCA complaint by ANSYS 2013-05-31 00:31:37 -04:00
Martin Beaudoin
29279eaaab .gitignore: blacklisting files subject to a DMCA complaint by ANSYS 2013-05-31 00:31:18 -04:00
Hrvoje Jasak
49f6442fc9 Updated gitignore for darwin 2010-11-06 23:24:27 +00:00
Hrvoje Jasak
202546e591 Clean-up 2010-10-04 10:38:32 +01:00
Hrvoje Jasak
a68af9f6b1 Mac OS X (Darwin) port, 1 2010-10-04 10:37:16 +01:00
Henrik Rusche
441f14c930 added .gitignore. Ignore local configuration files 2010-10-03 19:41:49 +02:00