Index: library/doc/html/functions_0x73.html
===================================================================
--- library/doc/html/functions_0x73.html (revision 397)
+++ library/doc/html/functions_0x73.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">
 <!--
@@ -133,9 +133,5 @@
 <li>save()
 : <a class="el" href="classbdm_1_1UIFile.html#1f8af28a0d8ef1a4956e198df0beb5ba">bdm::UIFile</a>
-<<<<<<< HEAD:library/doc/html/functions_0x73.html
 , <a class="el" href="classbdm_1_1UI.html#c83987949e6a9e79d6e093797ab7d917">bdm::UI</a>
-=======
-, <a class="el" href="classbdm_1_1UI.html#4514f93573a9d9126c506d176fbd3163">bdm::UI</a>
->>>>>>> doc:library/doc/html/functions_0x73.html
 <li>scalarnames
 : <a class="el" href="classbdm_1_1dirfilelog.html#7805040fe1ffa2a048c33980bc995793">bdm::dirfilelog</a>
@@ -167,9 +163,5 @@
 , <a class="el" href="classbdm_1_1EKFCh.html#50f9fbffad721f35e5ccb75d0f6b842a">bdm::EKFCh</a>
 , <a class="el" href="classbdm_1_1linfn.html#7e0e714b814532fc3e38daede24c5e68">bdm::linfn</a>
-<<<<<<< HEAD:library/doc/html/functions_0x73.html
 , <a class="el" href="classbdm_1_1mgamma.html#a0f21c2557b233a85838b497d040ab14">bdm::mgamma</a>
-=======
-, <a class="el" href="classbdm_1_1mlognorm.html#604cab0e8a76f9041dc3c606043bb39f">bdm::mlognorm</a>
->>>>>>> doc:library/doc/html/functions_0x73.html
 , <a class="el" href="classbdm_1_1bilinfn.html#5a508fbb5fc013904d9b62b2231442de">bdm::bilinfn</a>
 , <a class="el" href="classbdm_1_1emix.html#3a107a6b808a081389ef17af951c234a">bdm::emix</a>
@@ -191,5 +183,4 @@
 : <a class="el" href="classbdm_1_1merger__base.html#591d4ba19c9ece40aa96ee44d05e148d">bdm::merger_base</a>
 <li>set_statistics()
-<<<<<<< HEAD:library/doc/html/functions_0x73.html
 : <a class="el" href="classbdm_1_1EKFfull.html#1949a9b1496a855cc7c24e619bc52365">bdm::EKFfull</a>
 , <a class="el" href="classbdm_1_1ARX.html#539f9d0127423c94b912708d390e67b8">bdm::ARX</a>
@@ -207,23 +198,4 @@
 , <a class="el" href="classchmat.html#4b9271097d8317d9514c5d0d62cccb39">chmat</a>
 , <a class="el" href="classfsqmat.html#03a8f49eb4d38a054ecc522be59cd2ad">fsqmat</a>
-=======
-: <a class="el" href="classbdm_1_1eEmp.html#cef74aa5f87d10d440b9b1e8bc78c1e7">bdm::eEmp</a>
-, <a class="el" href="classbdm_1_1BMEF.html#d2b528b7a41ca67163152142f5404051">bdm::BMEF</a>
-, <a class="el" href="classbdm_1_1multiBM.html#dbe6b90d410dc062a233d1dc09eeba52">bdm::multiBM</a>
-, <a class="el" href="classbdm_1_1eEmp.html#7cfd383180b486fe4526bdf0179350c0">bdm::eEmp</a>
-, <a class="el" href="classbdm_1_1EKFfull.html#1949a9b1496a855cc7c24e619bc52365">bdm::EKFfull</a>
-, <a class="el" href="classbdm_1_1ARX.html#539f9d0127423c94b912708d390e67b8">bdm::ARX</a>
-<li>set_support()
-: <a class="el" href="classbdm_1_1merger__base.html#337e1e56ef95d3d3ee922e8b81be95f8">bdm::merger_base</a>
-<li>setCh()
-: <a class="el" href="classchmat.html#4c8b321967b14ed2616a2abb9498a979">chmat</a>
-<li>setD()
-: <a class="el" href="classfsqmat.html#922f8190c13987cbcdb33ec2bf5cf105">fsqmat</a>
-, <a class="el" href="classchmat.html#a4fc7f9b0539b97c414442a22f3db6e8">chmat</a>
-, <a class="el" href="classldmat.html#0884a613b94fde61bfc84288e73ce57f">ldmat</a>
-, <a class="el" href="classfsqmat.html#03a8f49eb4d38a054ecc522be59cd2ad">fsqmat</a>
-, <a class="el" href="classchmat.html#4b9271097d8317d9514c5d0d62cccb39">chmat</a>
-, <a class="el" href="classldmat.html#7619922b4de18830ce5351c6b5667e60">ldmat</a>
->>>>>>> doc:library/doc/html/functions_0x73.html
 <li>setL()
 : <a class="el" href="classldmat.html#32ff66296627ff5341d7c0b973249614">ldmat</a>
@@ -231,11 +203,7 @@
 : <a class="el" href="classbdm_1_1compositepdf.html#c71fc2c51f49d797e61f479f543c75ce">bdm::compositepdf</a>
 <li>SettingResolver()
-<<<<<<< HEAD:library/doc/html/functions_0x73.html
 : <a class="el" href="classbdm_1_1SettingResolver.html#e2299746b95bf8af54a867aaf52fc8da">bdm::SettingResolver</a>
 <li>setup()
 : <a class="el" href="classitpp_1_1Gamma__RNG.html#dfaae19411e39aa87e1f72e409b6babe">itpp::Gamma_RNG</a>
-=======
-: <a class="el" href="classbdm_1_1UI_1_1SettingResolver.html#9347bbb99745bbf902e8e0c3cd58ba14">bdm::UI::UI::SettingResolver</a>
->>>>>>> doc:library/doc/html/functions_0x73.html
 <li>setY()
 : <a class="el" href="classbdm_1_1eWishartCh.html#4eee757c0535c2a88bb20f0767c64981">bdm::eWishartCh</a>
@@ -245,5 +213,4 @@
 : <a class="el" href="classsqmat.html#4268750c040c716b2c05037f725078a2">sqmat</a>
 <li>sqrt_mult()
-<<<<<<< HEAD:library/doc/html/functions_0x73.html
 : <a class="el" href="classldmat.html#fc380626ced6f9244fb58c5f0231174d">ldmat</a>
 , <a class="el" href="classfsqmat.html#842a774077ee34ac3c36d180ab33e103">fsqmat</a>
@@ -255,17 +222,6 @@
 , <a class="el" href="classbdm_1_1logger.html#4f31c03578a7b9b30d8b1f8c338a37e8">bdm::logger</a>
 , <a class="el" href="classbdm_1_1DS.html#9a14c64d881e838ddc3a5617ee8a973b">bdm::DS</a>
-=======
-: <a class="el" href="classfsqmat.html#842a774077ee34ac3c36d180ab33e103">fsqmat</a>
-, <a class="el" href="classldmat.html#fc380626ced6f9244fb58c5f0231174d">ldmat</a>
-, <a class="el" href="classsqmat.html#6b79438b5d7544a9c8e110a145355d8f">sqmat</a>
-, <a class="el" href="classchmat.html#b22aa239dbaca33e3fb93b4f674d7051">chmat</a>
-<li>step()
-: <a class="el" href="classbdm_1_1MemDS.html#21916feb3e5ff960855c09b06a0d279b">bdm::MemDS</a>
->>>>>>> doc:library/doc/html/functions_0x73.html
 , <a class="el" href="classbdm_1_1dirfilelog.html#f79660645d09aa2d8bdd18923a721662">bdm::dirfilelog</a>
 , <a class="el" href="classbdm_1_1memlog.html#69964f0472e53098528ee41507bdfc77">bdm::memlog</a>
-, <a class="el" href="classbdm_1_1ArxDS.html#57dfa26b23cc03d53b123fa7e0474b19">bdm::ArxDS</a>
-, <a class="el" href="classbdm_1_1DS.html#9a14c64d881e838ddc3a5617ee8a973b">bdm::DS</a>
-, <a class="el" href="classbdm_1_1logger.html#4f31c03578a7b9b30d8b1f8c338a37e8">bdm::logger</a>
 <li>str()
 : <a class="el" href="classbdm_1_1str.html#7c6b9dccc6814d7bd1e8e2208a0d3f3f">bdm::str</a>
@@ -278,11 +234,7 @@
 </ul>
 </div>
-<<<<<<< HEAD:library/doc/html/functions_0x73.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:51 2009 for mixpp by&nbsp;
->>>>>>> doc:library/doc/html/functions_0x73.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>
