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

Timestamp:

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

Author:

smidl

Message:

doc

Files:

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

library/doc/html/classbdm_1_1datalink__m2m.html

@@ -69 +69 @@
 </div>
 <div class="contents">
+<<<<<<< HEAD:library/doc/html/classbdm_1_1datalink__m2m.html
 <h1>bdm::datalink_m2m Class Reference</h1><!-- doxytag: class="bdm::datalink_m2m" --><!-- doxytag: inherits="bdm::datalink_m2e" --><code>#include &lt;<a class="el" href="bdmbase_8h_source.html">bdmbase.h</a>&gt;</code>
+=======
+<h1>bdm::datalink_m2m Class Reference</h1><!-- doxytag: class="bdm::datalink_m2m" --><!-- doxytag: inherits="bdm::datalink_m2e" --><code>#include &lt;<a class="el" href="bdmbase_8h-source.html">bdmbase.h</a>&gt;</code>
+>>>>>>> doc:library/doc/html/classbdm_1_1datalink__m2m.html
 <p>
 
@@ -150 +154 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 DataLink is a connection between <a class="el" href="classbdm_1_1mpdf.html" title="Conditional probability density, e.g. modeling some dependencies.">mpdf</a> and its superordinate (Up) This class links <hr>The documentation for this class was generated from the following file:<ul>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1datalink__m2m.html
 <li><a class="el" href="bdmbase_8h_source.html">bdmbase.h</a></ul>
 </div>
 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:48 2009 for mixpp by&nbsp;
+=======
+<li><a class="el" href="bdmbase_8h-source.html">bdmbase.h</a></ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jun 23 19:52:52 2009 for mixpp by&nbsp;
+>>>>>>> doc:library/doc/html/classbdm_1_1datalink__m2m.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>