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

Timestamp:

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

Author:

smidl

Message:

doc

Files:

• library/doc/html/classbdm_1_1dirfilelog.html (modified) (3 diffs)

library/doc/html/classbdm_1_1dirfilelog.html

@@ -230 +230 @@
 <p>
 returns an identifier which will be later needed for calling the <code><a class="el" href="classbdm_1_1logger.html#397c014b0aaf3581516e2a105d26a5c9" title="log this vector">logit()</a></code> function For empty <a class="el" href="classbdm_1_1RV.html" title="Class representing variables, most often random variables.">RV</a> it returns -1, this entry will be ignored by <code><a class="el" href="classbdm_1_1logger.html#397c014b0aaf3581516e2a105d26a5c9" title="log this vector">logit()</a></code>. 
+<<<<<<< HEAD:library/doc/html/classbdm_1_1dirfilelog.html
 <p>References <a class="el" href="bdmbase_8h_source.html#l00569">bdm::logger::entries</a>, and <a class="el" href="bdmbase_8h_source.html#l00571">bdm::logger::names</a>.</p>
 
 <p>Referenced by <a class="el" href="datasources_8h_source.html#l00191">bdm::ArxDS::log_add()</a>, <a class="el" href="bdmbase_8h_source.html#l00819">bdm::BM::log_add()</a>, and <a class="el" href="bdmbase_8h_source.html#l00686">bdm::DS::log_add()</a>.</p>
+=======
+<p>References <a class="el" href="bdmbase_8h-source.html#l00123">bdm::RV::_dsize()</a>, <a class="el" href="bdmbase_8h-source.html#l00569">bdm::logger::entries</a>, and <a class="el" href="bdmbase_8h-source.html#l00571">bdm::logger::names</a>.</p>
+
+<p>Referenced by <a class="el" href="datasources_8h-source.html#l00191">bdm::ArxDS::log_add()</a>, <a class="el" href="bdmbase_8h-source.html#l00819">bdm::BM::log_add()</a>, and <a class="el" href="bdmbase_8h-source.html#l00686">bdm::DS::log_add()</a>.</p>
+>>>>>>> doc:library/doc/html/classbdm_1_1dirfilelog.html
 
 </div>
@@ -292 +298 @@
 </dl>
 
+<<<<<<< HEAD:library/doc/html/classbdm_1_1dirfilelog.html
 <p>References <a class="el" href="loggers_8h_source.html#l00097">dirname</a>, <a class="el" href="bdmbase_8h_source.html#l00569">bdm::logger::entries</a>, <a class="el" href="loggers_8h_source.html#l00032">bdm::memlog::maxlen</a>, <a class="el" href="loggers_8h_source.html#l00099">scalarnames</a>, and <a class="el" href="loggers_8h_source.html#l00036">bdm::memlog::vectors</a>.</p>
+=======
+<p>References <a class="el" href="loggers_8h-source.html#l00097">dirname</a>, <a class="el" href="bdmbase_8h-source.html#l00569">bdm::logger::entries</a>, <a class="el" href="loggers_8h-source.html#l00032">bdm::memlog::maxlen</a>, <a class="el" href="loggers_8h-source.html#l00099">scalarnames</a>, and <a class="el" href="loggers_8h-source.html#l00036">bdm::memlog::vectors</a>.</p>
+>>>>>>> doc:library/doc/html/classbdm_1_1dirfilelog.html
 
 <p>Referenced by <a class="el" href="loggers_8cpp_source.html#l00155">finalize()</a>, <a class="el" href="loggers_8cpp_source.html#l00046">init()</a>, and <a class="el" href="loggers_8cpp_source.html#l00144">step()</a>.</p>
@@ -301 +311 @@
 <li><a class="el" href="loggers_8h_source.html">loggers.h</a><li>loggers.cpp</ul>
 </div>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1dirfilelog.html
 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:49 2009 for mixpp by&nbsp;
+=======
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jun 23 19:52:52 2009 for mixpp by&nbsp;
+>>>>>>> doc:library/doc/html/classbdm_1_1dirfilelog.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>