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

GIT: Resolved conflict on merge from upstream

Browse Source
This commit is contained in:
Andrew Heather
2015-12-22 16:49:44 +00:00
parent 0e01c44129 5d7d3b793f
commit 04752147c8
381 changed files with 10834 additions and 2450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/Doxygen/_Footer
View File

@ -3,7 +3,7 @@
<div class="footer">
<p>
Copyright&nbsp;&copy;&nbsp;2011-2013&nbsp;
<a href="http://www.openfoam.org/about">OpenFOAM Foundation</a>
<a href="http://www.openfoam.com/about">OpenFOAM</a>
|
OPENFOAM&reg; is a registered
<a href="http://www.openfoam.com/legal/trademark-policy.php">trademarks

4
doc/Doxygen/_Header
View File

@ -22,12 +22,12 @@
<div class="page-container">
<div class="header">
<div class="header-top">
<a class="sitelogo" href="http://www.openfoam.org" title="Home">
<a class="sitelogo" href="http://www.openfoam.com" title="Home">
<img class=left src="../css/img/OpenFOAMlogo.png">
</a>
<div class="sitename">
<h1>
<a href="http://foam.sourceforge.net/doc/Doxygen/html/"
<a href="http://www.openfoam.com/doc/Doxygen/html/"
title="Source Guide">OpenFOAM C++ Documentation
</a>
</h1>