Show
Ignore:
Timestamp:
06/24/09 21:57:21 (16 years ago)
Author:
smidl
Message:

doc 2

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • library/doc/html/classbdm_1_1datalink__m2m.html

    r397 r398  
    55<link href="doxygen.css" rel="stylesheet" type="text/css"> 
    66</head><body> 
    7 <!-- Generated by Doxygen 1.5.9 --> 
     7<!-- Generated by Doxygen 1.5.8 --> 
    88<script type="text/javascript"> 
    99<!-- 
    … …  
    6969</div> 
    7070<div class="contents"> 
    71 <<<<<<< HEAD:library/doc/html/classbdm_1_1datalink__m2m.html 
    72 <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> 
    73 ======= 
    7471<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> 
    75 >>>>>>> doc:library/doc/html/classbdm_1_1datalink__m2m.html 
    7672<p> 
    7773 
    … …  
    154150<hr><a name="_details"></a><h2>Detailed Description</h2> 
    155151DataLink 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> 
    156 <<<<<<< HEAD:library/doc/html/classbdm_1_1datalink__m2m.html 
    157 <li><a class="el" href="bdmbase_8h_source.html">bdmbase.h</a></ul> 
    158 </div> 
    159 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:48 2009 for mixpp by&nbsp; 
    160 ======= 
    161152<li><a class="el" href="bdmbase_8h-source.html">bdmbase.h</a></ul> 
    162153</div> 
    163 <hr size="1"><address style="text-align: right;"><small>Generated on Tue Jun 23 19:52:52 2009 for mixpp by&nbsp; 
    164 >>>>>>> doc:library/doc/html/classbdm_1_1datalink__m2m.html 
     154<hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 21:53:05 2009 for mixpp by&nbsp; 
    165155<a href="http://www.doxygen.org/index.html"> 
    166 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.9 </small></address> 
     156<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address> 
    167157</body> 
    168158</html>