Index: library/doc/html/classbdm_1_1egiw.html
===================================================================
--- library/doc/html/classbdm_1_1egiw.html (revision 396)
+++ library/doc/html/classbdm_1_1egiw.html (revision 397)
@@ -72,5 +72,9 @@
 <a href="#_details">More...</a>
 <p>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1egiw.html
 <code>#include &lt;<a class="el" href="exp__family_8h_source.html">exp_family.h</a>&gt;</code>
+=======
+<code>#include &lt;<a class="el" href="exp__family_8h-source.html">exp_family.h</a>&gt;</code>
+>>>>>>> doc:library/doc/html/classbdm_1_1egiw.html
 <p>
 
@@ -82,5 +86,5 @@
 vec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1egiw.html#920f21548b7a3723923dd108fe514c61">sample</a> () const </td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Returns a sample, <img class="formulaInl" alt="$ x $" src="form_45.png"> from density <img class="formulaInl" alt="$ f_x()$" src="form_46.png">. <br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Returns a sample, <img class="formulaInl" alt="$ x $" src="form_7.png"> from density <img class="formulaInl" alt="$ f_x()$" src="form_8.png">. <br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="df70c05f918c3a6f86d60f10c1fd6ba2"></a><!-- doxytag: member="bdm::egiw::mean" ref="df70c05f918c3a6f86d60f10c1fd6ba2" args="() const " -->
 vec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1egiw.html#df70c05f918c3a6f86d60f10c1fd6ba2">mean</a> () const </td></tr>
@@ -94,5 +98,5 @@
 vec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1egiw.html#66d2ba9295c306012b309efcc9e516f0">est_theta</a> () const </td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">LS estimate of <img class="formulaInl" alt="$\theta$" src="form_80.png">. <br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">LS estimate of <img class="formulaInl" alt="$\theta$" src="form_90.png">. <br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="88c321a2051d1afdbb31a098896a717b"></a><!-- doxytag: member="bdm::egiw::est_theta_cov" ref="88c321a2051d1afdbb31a098896a717b" args="() const " -->
 <a class="el" href="classldmat.html">ldmat</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1egiw.html#88c321a2051d1afdbb31a098896a717b">est_theta_cov</a> () const </td></tr>
@@ -109,5 +113,5 @@
 double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1egiw.html#41d72ba7b2abc8a9a4209ffa98ed5633">lognc</a> () const </td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">logarithm of the normalizing constant, <img class="formulaInl" alt="$\mathcal{I}$" src="form_79.png"> <br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">logarithm of the normalizing constant, <img class="formulaInl" alt="$\mathcal{I}$" src="form_89.png"> <br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="8e610e95401a11baf34f65e16ecd87be"></a><!-- doxytag: member="bdm::egiw::pow" ref="8e610e95401a11baf34f65e16ecd87be" args="(double p)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1egiw.html#8e610e95401a11baf34f65e16ecd87be">pow</a> (double p)</td></tr>
@@ -180,5 +184,5 @@
 virtual mat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1epdf.html#b4cf45fd83cc7573ede9fe1215256058">sample_m</a> (int N) const </td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Returns N samples, <img class="formulaInl" alt="$ [x_1 , x_2 , \ldots \ $" src="form_47.png"> from density <img class="formulaInl" alt="$ f_x(rv)$" src="form_48.png">. <br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Returns N samples, <img class="formulaInl" alt="$ [x_1 , x_2 , \ldots \ $" src="form_9.png"> from density <img class="formulaInl" alt="$ f_x(rv)$" src="form_10.png">. <br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="34956d4dd3176eeb5937cf48a1546b62"></a><!-- doxytag: member="bdm::egiw::evallog_m" ref="34956d4dd3176eeb5937cf48a1546b62" args="(const mat &amp;Val) const " -->
 virtual vec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1epdf.html#34956d4dd3176eeb5937cf48a1546b62">evallog_m</a> (const mat &amp;Val) const </td></tr>
@@ -249,5 +253,9 @@
 Gauss-inverse-Wishart density stored in LD form. 
 <p>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1egiw.html
 For <img class="formulaInl" alt="$p$" src="form_58.png">-variate densities, given rv.count() should be <img class="formulaInl" alt="$p\times$" src="form_59.png"> V.rows(). <hr><h2>Member Function Documentation</h2>
+=======
+For <img class="formulaInl" alt="$p$" src="form_66.png">-variate densities, given rv.count() should be <img class="formulaInl" alt="$p\times$" src="form_67.png"> V.rows(). <hr><h2>Member Function Documentation</h2>
+>>>>>>> doc:library/doc/html/classbdm_1_1egiw.html
 <a class="anchor" name="55b76ec75bd2df5ef9cab3be20a33bbb"></a><!-- doxytag: member="bdm::egiw::from_setting" ref="55b76ec75bd2df5ef9cab3be20a33bbb" args="(const Setting &amp;set)" -->
 <div class="memitem">
@@ -273,12 +281,22 @@
 <p>Reimplemented from <a class="el" href="classbdm_1_1epdf.html#fa9efc98a065b31c630fe18cc418f725">bdm::epdf</a>.</p>
 
+<<<<<<< HEAD:library/doc/html/classbdm_1_1egiw.html
 <p>References <a class="el" href="exp__family_8h_source.html#l00184">dimx</a>, <a class="el" href="user__info_8h_source.html#l00358">bdm::UI::get()</a>, <a class="el" href="exp__family_8h_source.html#l00182">nu</a>, <a class="el" href="bdmbase_8h_source.html#l00239">bdm::epdf::rv</a>, and <a class="el" href="bdmbase_8h_source.html#l00307">bdm::epdf::set_rv()</a>.</p>
+=======
+<p>References <a class="el" href="exp__family_8h-source.html#l00184">dimx</a>, <a class="el" href="exp__family_8h-source.html#l00182">nu</a>, <a class="el" href="bdmbase_8h-source.html#l00239">bdm::epdf::rv</a>, and <a class="el" href="bdmbase_8h-source.html#l00307">bdm::epdf::set_rv()</a>.</p>
+>>>>>>> doc:library/doc/html/classbdm_1_1egiw.html
 
 </div>
 </div><p>
 <hr>The documentation for this class was generated from the following files:<ul>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1egiw.html
 <li><a class="el" href="exp__family_8h_source.html">exp_family.h</a><li>exp_family.cpp</ul>
 </div>
 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:54 2009 for mixpp by&nbsp;
+=======
+<li><a class="el" href="exp__family_8h-source.html">exp_family.h</a><li>exp_family.cpp</ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jun 23 19:52:54 2009 for mixpp by&nbsp;
+>>>>>>> doc:library/doc/html/classbdm_1_1egiw.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>
