Changeset 397 for library/doc/html/classbdm_1_1constfn.html

Timestamp:

06/24/09 21:56:30 (16 years ago)

Author:

smidl

Message:

doc

Files:

• library/doc/html/classbdm_1_1constfn.html (modified) (2 diffs)

library/doc/html/classbdm_1_1constfn.html

@@ -69 +69 @@
 </div>
 <div class="contents">
-<h1>bdm::constfn Class Reference</h1><!-- doxytag: class="bdm::constfn" --><!-- doxytag: inherits="bdm::fnc" -->class representing function <img class="formulaInl" alt="$f(x) = a$" src="form_87.png">, here <code>rv</code> is empty  
+<h1>bdm::constfn Class Reference</h1><!-- doxytag: class="bdm::constfn" --><!-- doxytag: inherits="bdm::fnc" -->class representing function <img class="formulaInl" alt="$f(x) = a$" src="form_40.png">, here <code>rv</code> is empty  
 <a href="#_details">More...</a>
 <p>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1constfn.html
 <code>#include &lt;<a class="el" href="functions_8h_source.html">functions.h</a>&gt;</code>
+=======
+<code>#include &lt;<a class="el" href="functions_8h-source.html">functions.h</a>&gt;</code>
+>>>>>>> doc:library/doc/html/classbdm_1_1constfn.html
 <p>
 
@@ -118 +122 @@
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1constfn.html
 class representing function <img class="formulaInl" alt="$f(x) = a$" src="form_87.png">, here <code>rv</code> is empty <hr>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="functions_8h_source.html">functions.h</a></ul>
 </div>
 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:51 2009 for mixpp by&nbsp;
+=======
+class representing function <img class="formulaInl" alt="$f(x) = a$" src="form_40.png">, here <code>rv</code> is empty <hr>The documentation for this class was generated from the following file:<ul>
+<li><a class="el" href="functions_8h-source.html">functions.h</a></ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jun 23 19:52:53 2009 for mixpp by&nbsp;
+>>>>>>> doc:library/doc/html/classbdm_1_1constfn.html
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.9 </small></address>