Index: library/doc/html/functions_0x6f.html
===================================================================
--- library/doc/html/functions_0x6f.html (revision 397)
+++ library/doc/html/functions_0x6f.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">
 <!--
@@ -115,11 +115,7 @@
 : <a class="el" href="classbdm_1_1RV.html#452fb5f7ab1eafe17932bf9f458d0415">bdm::RV</a>
 , <a class="el" href="classbdm_1_1eprod.html#5194b47dd05a5886e0745250b6704953">bdm::eprod</a>
-<<<<<<< HEAD:library/doc/html/functions_0x6f.html
 , <a class="el" href="classitpp_1_1Gamma__RNG.html#98e2e65456bca33fca602b2bd607235e">itpp::Gamma_RNG</a>
 , <a class="el" href="classbdm_1_1RV.html#6f3daf0f857fff53a1c0a445fe160966">bdm::RV</a>
 , <a class="el" href="classitpp_1_1Gamma__RNG.html#d407bbcda8a39e3f07cac3fdf58ca430">itpp::Gamma_RNG</a>
-=======
-, <a class="el" href="classbdm_1_1RV.html#6f3daf0f857fff53a1c0a445fe160966">bdm::RV</a>
->>>>>>> doc:library/doc/html/functions_0x6f.html
 <li>operator*=()
 : <a class="el" href="classfsqmat.html#af800e7b2146da5e60897255dde80059">fsqmat</a>
@@ -134,15 +130,8 @@
 , <a class="el" href="classfsqmat.html#e976bc9d899961e1d2087b0630ed33b7">fsqmat</a>
 <li>operator&lt;&lt;
-<<<<<<< HEAD:library/doc/html/functions_0x6f.html
 : <a class="el" href="classbdm_1_1RV.html#cad6f15535d10437f6690cb4492176a8">bdm::RV</a>
 , <a class="el" href="classbdm_1_1KalmanFull.html#86ba216243ed95bb46d80d88775d16af">bdm::KalmanFull</a>
 , <a class="el" href="classldmat.html#eaaa0baa6026b84cfcbced41c84599d1">ldmat</a>
 , <a class="el" href="classfsqmat.html#e06aba54d61e807b41bd68b5ee6ac22f">fsqmat</a>
-=======
-: <a class="el" href="classfsqmat.html#e06aba54d61e807b41bd68b5ee6ac22f">fsqmat</a>
-, <a class="el" href="classldmat.html#eaaa0baa6026b84cfcbced41c84599d1">ldmat</a>
-, <a class="el" href="classbdm_1_1RV.html#cad6f15535d10437f6690cb4492176a8">bdm::RV</a>
-, <a class="el" href="classbdm_1_1KalmanFull.html#86ba216243ed95bb46d80d88775d16af">bdm::KalmanFull</a>
->>>>>>> doc:library/doc/html/functions_0x6f.html
 <li>opt_L_smp
 : <a class="el" href="classbdm_1_1PF.html#98ef9ff80c394fafd28680b7a3f831b1">bdm::PF</a>
@@ -152,29 +141,18 @@
 : <a class="el" href="classbdm_1_1PF.html#5a49463a88ee80771a464861df845ff6">bdm::PF</a>
 <li>opupdt()
-<<<<<<< HEAD:library/doc/html/functions_0x6f.html
 : <a class="el" href="classldmat.html#0f0f6e083e6d947cf58097ffce3ccd1a">ldmat</a>
 , <a class="el" href="classsqmat.html#b223484796661f2dadb5607a86ce0581">sqmat</a>
 , <a class="el" href="classchmat.html#bbc2d98d7455b1f38828907d442836bf">chmat</a>
 , <a class="el" href="classfsqmat.html#b36530e155667fe9f1bd58394e50c65a">fsqmat</a>
-=======
-: <a class="el" href="classfsqmat.html#b36530e155667fe9f1bd58394e50c65a">fsqmat</a>
-, <a class="el" href="classsqmat.html#b223484796661f2dadb5607a86ce0581">sqmat</a>
-, <a class="el" href="classchmat.html#bbc2d98d7455b1f38828907d442836bf">chmat</a>
-, <a class="el" href="classldmat.html#0f0f6e083e6d947cf58097ffce3ccd1a">ldmat</a>
->>>>>>> doc:library/doc/html/functions_0x6f.html
 <li>ownComs()
-: <a class="el" href="classbdm_1_1emix.html#965fb16669250a3d28bc62cf76276d8e">bdm::emix</a>
-, <a class="el" href="classbdm_1_1egiwmix.html#adc550fe74df25524c20867e89b5b096">bdm::egiwmix</a>
+: <a class="el" href="classbdm_1_1egiwmix.html#adc550fe74df25524c20867e89b5b096">bdm::egiwmix</a>
+, <a class="el" href="classbdm_1_1emix.html#965fb16669250a3d28bc62cf76276d8e">bdm::emix</a>
 <li>ownnom()
 : <a class="el" href="classbdm_1_1mratio.html#c8b39fea586d4258bb3c881406edaf15">bdm::mratio</a>
 </ul>
 </div>
-<<<<<<< HEAD:library/doc/html/functions_0x6f.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_0x6f.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>
