Index: library/doc/html/functions_0x66.html
===================================================================
--- library/doc/html/functions_0x66.html (revision 397)
+++ library/doc/html/functions_0x66.html (revision 398)
@@ -5,5 +5,5 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.9 -->
+<!-- Generated by Doxygen 1.5.8 -->
 <script type="text/javascript">
 <!--
@@ -126,5 +126,4 @@
 : <a class="el" href="classbdm_1_1BMEF.html#1331865e10fb1ccef65bb4c47fa3be64">bdm::BMEF</a>
 <li>from_setting()
-<<<<<<< HEAD:library/doc/html/functions_0x66.html
 : <a class="el" href="classbdm_1_1mgnorm.html#d717dacc6a9eb967f8410994dc6dc6f9">bdm::mgnorm&lt; sq_T &gt;</a>
 , <a class="el" href="classbdm_1_1mgamma.html#da2af0f327e5452bee71d1bf97452ae4">bdm::mgamma</a>
@@ -151,41 +150,11 @@
 <li>fsqmat()
 : <a class="el" href="classfsqmat.html#c01f3e9bb590f2a2921369d672f3ce1e">fsqmat</a>
-=======
-: <a class="el" href="classbdm_1_1mgamma.html#da2af0f327e5452bee71d1bf97452ae4">bdm::mgamma</a>
-, <a class="el" href="classbdm_1_1migamma__ref.html#9e7e0f7d2aa9ecca8ec1af8cbcb5ef1d">bdm::migamma_ref</a>
-, <a class="el" href="classbdm_1_1euni.html#77f5fef1f006fe056066da23b9e5f042">bdm::euni</a>
-, <a class="el" href="classbdm_1_1egamma.html#8a6fd1a1c0190f3e0d95a2a1f99aafc1">bdm::egamma</a>
-, <a class="el" href="classbdm_1_1ArxDS.html#9b109ee7bba9774057b107383b6ecc24">bdm::ArxDS</a>
-, <a class="el" href="classbdm_1_1merger__base.html#10dd390fc6f0d1733bb07cb51977160c">bdm::merger_base</a>
-, <a class="el" href="classbdm_1_1mprod.html#bfa7478f8df1de6d8cd4c349db512831">bdm::mprod</a>
-, <a class="el" href="classbdm_1_1MultiModel.html#7bd320fa2540883749b3f83cf2261878">bdm::MultiModel</a>
-, <a class="el" href="classbdm_1_1EKFCh.html#3952e181ef0cf230c325ad3be1f002df">bdm::EKFCh</a>
-, <a class="el" href="classbdm_1_1memlog.html#7352b474bc54c35ab7c9297c5b958629">bdm::memlog</a>
-, <a class="el" href="classbdm_1_1dirfilelog.html#a32de0f314a30392d69f07458643514e">bdm::dirfilelog</a>
-, <a class="el" href="classbdm_1_1root.html#0551e3121091c5199bf4413b50522176">bdm::root</a>
-, <a class="el" href="classbdm_1_1mlognorm.html#49e45ea13a869da607ef9be7a229128a">bdm::mlognorm</a>
-, <a class="el" href="classbdm_1_1ARX.html#9637412df898048bafaefee9dc7e9f6c">bdm::ARX</a>
-, <a class="el" href="classbdm_1_1ITppFileDS.html#fd192da176625a909fa853458b604566">bdm::ITppFileDS</a>
-, <a class="el" href="classbdm_1_1mgnorm.html#d717dacc6a9eb967f8410994dc6dc6f9">bdm::mgnorm&lt; sq_T &gt;</a>
-, <a class="el" href="classbdm_1_1mpdf.html#30a0bceb948e287d497c578e371b1667">bdm::mpdf</a>
-, <a class="el" href="classbdm_1_1egiw.html#55b76ec75bd2df5ef9cab3be20a33bbb">bdm::egiw</a>
-, <a class="el" href="classbdm_1_1RV.html#6564bdd36b6845a51446a192d33e1194">bdm::RV</a>
-, <a class="el" href="classbdm_1_1epdf.html#fa9efc98a065b31c630fe18cc418f725">bdm::epdf</a>
-, <a class="el" href="classbdm_1_1enorm.html#61bd470764020bea6e1ed35000f259e6">bdm::enorm&lt; sq_T &gt;</a>
-, <a class="el" href="classbdm_1_1mepdf.html#27ef18a3e3b1b5de02739d1324bf25fb">bdm::mepdf</a>
-<li>fsqmat()
-: <a class="el" href="classfsqmat.html#1929fbc9fe375f1d67f979d0d302336f">fsqmat</a>
->>>>>>> doc:library/doc/html/functions_0x66.html
 <li>fy
 : <a class="el" href="classbdm_1_1Kalman.html#ba555c394c429f6831c9bbabfa2c944c">bdm::Kalman&lt; sq_T &gt;</a>
 </ul>
 </div>
-<<<<<<< HEAD:library/doc/html/functions_0x66.html
-<hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:47 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/functions_0x66.html
+<hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 21:53:05 2009 for mixpp by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.9 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>
 </html>
