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

Timestamp:

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

Author:

smidl

Message:

doc

Files:

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

library/doc/html/merger_8h.html

@@ -68 +68 @@
 <a href="#_details">More...</a>
 <p>
+<<<<<<< HEAD:library/doc/html/merger_8h.html
 <code>#include &quot;<a class="el" href="mixtures_8h_source.html">../estim/mixtures.h</a>&quot;</code><br>
+=======
+<code>#include &quot;<a class="el" href="mixtures_8h-source.html">../estim/mixtures.h</a>&quot;</code><br>
+>>>>>>> doc:library/doc/html/merger_8h.html
 
 <p>
@@ -100 +104 @@
 ----------------------------------- BDM++ - C++ library for Bayesian Decision Making under Uncertainty<p>
 Using IT++ for numerical operations ----------------------------------- </div>
+<<<<<<< HEAD:library/doc/html/merger_8h.html
 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:46 2009 for mixpp by&nbsp;
+=======
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jun 23 19:52:50 2009 for mixpp by&nbsp;
+>>>>>>> doc:library/doc/html/merger_8h.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>