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/merger_8h.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<!-- 
    … …  
    6868<a href="#_details">More...</a> 
    6969<p> 
    70 <<<<<<< HEAD:library/doc/html/merger_8h.html 
    71 <code>#include &quot;<a class="el" href="mixtures_8h_source.html">../estim/mixtures.h</a>&quot;</code><br> 
    72 ======= 
    7370<code>#include &quot;<a class="el" href="mixtures_8h-source.html">../estim/mixtures.h</a>&quot;</code><br> 
    74 >>>>>>> doc:library/doc/html/merger_8h.html 
    7571 
    7672<p> 
    77 <a href="merger_8h_source.html">Go to the source code of this file.</a><table border="0" cellpadding="0" cellspacing="0"> 
     73<a href="merger_8h-source.html">Go to the source code of this file.</a><table border="0" cellpadding="0" cellspacing="0"> 
    7874<tr><td></td></tr> 
    7975<tr><td colspan="2"><br><h2>Classes</h2></td></tr> 
    … …  
    9894 
    9995</table> 
    100 <hr><h2>Detailed Description</h2> 
     96<hr><a name="_details"></a><h2>Detailed Description</h2> 
    10197Mergers for combination of pdfs.  
    10298<p> 
    … …  
    104100----------------------------------- BDM++ - C++ library for Bayesian Decision Making under Uncertainty<p> 
    105101Using IT++ for numerical operations ----------------------------------- </div> 
    106 <<<<<<< HEAD:library/doc/html/merger_8h.html 
    107 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:46 2009 for mixpp by&nbsp; 
    108 ======= 
    109 <hr size="1"><address style="text-align: right;"><small>Generated on Tue Jun 23 19:52:50 2009 for mixpp by&nbsp; 
    110 >>>>>>> doc:library/doc/html/merger_8h.html 
     102<hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 21:53:05 2009 for mixpp by&nbsp; 
    111103<a href="http://www.doxygen.org/index.html"> 
    112 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.9 </small></address> 
     104<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address> 
    113105</body> 
    114106</html>