Andrew Heather 0192c281f0 ENH: Added mergeHistory doc showing merges from Foundation line		2015-12-22 16:53:39 +00:00
..
caseDicts	GIT: Resolved conflict	2015-12-09 16:19:28 +00:00
codeTemplates	Completed update ...ErrorIn -> ...ErrorInFunction	2015-11-11 09:03:39 +00:00
config	GIT: Resolved conflict on merge from upstream	2015-12-22 16:49:44 +00:00
templates	GIT: Resolved conflict	2015-12-09 16:19:28 +00:00
thermoData	Corrected names of compounds in thermoData to use upper/lower	2015-08-08 17:50:38 +01:00
bashrc	ENH: Updated version tag from OpenFOAM-dev-OpenCFD to OpenFOAM-plus	2015-12-22 16:52:31 +00:00
cellModels	STYLE: Updated links from openfoam.org to openfoam.com	2015-12-09 15:03:05 +00:00
controlDict	GIT: Resolved conflict	2015-12-09 16:19:28 +00:00
cshrc	ENH: Updated version tag from OpenFOAM-dev-OpenCFD to OpenFOAM-plus	2015-12-22 16:52:31 +00:00
mergeHistory	ENH: Added mergeHistory doc showing merges from Foundation line	2015-12-22 16:53:39 +00:00