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

Timestamp:

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

Author:

smidl

Message:

doc

Files:

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

library/doc/html/classbdm_1_1FileDS.html

@@ -69 +69 @@
 </div>
 <div class="contents">
+<<<<<<< HEAD:library/doc/html/classbdm_1_1FileDS.html
 <h1>bdm::FileDS Class Reference</h1><!-- doxytag: class="bdm::FileDS" --><!-- doxytag: inherits="bdm::MemDS" --><code>#include &lt;<a class="el" href="datasources_8h_source.html">datasources.h</a>&gt;</code>
+=======
+<h1>bdm::FileDS Class Reference</h1><!-- doxytag: class="bdm::FileDS" --><!-- doxytag: inherits="bdm::MemDS" --><code>#include &lt;<a class="el" href="datasources_8h-source.html">datasources.h</a>&gt;</code>
+>>>>>>> doc:library/doc/html/classbdm_1_1FileDS.html
 <p>
 
@@ -113 +117 @@
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1MemDS.html#21916feb3e5ff960855c09b06a0d279b">step</a> ()</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Moves from <img class="formulaInl" alt="$ t $" src="form_50.png"> to <img class="formulaInl" alt="$ t+1 $" src="form_51.png">, i.e. perfroms the actions and reads response of the system. <br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Moves from <img class="formulaInl" alt="$ t $" src="form_12.png"> to <img class="formulaInl" alt="$ t+1 $" src="form_13.png">, i.e. perfroms the actions and reads response of the system. <br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="ed2113851294ed96abe60fc3f05aa660"></a><!-- doxytag: member="bdm::FileDS::_drv" ref="ed2113851294ed96abe60fc3f05aa660" args="() const " -->
 virtual <a class="el" href="classbdm_1_1RV.html">RV</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1DS.html#ed2113851294ed96abe60fc3f05aa660">_drv</a> () const </td></tr>
@@ -183 +187 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Pseudovirtual class for reading data from files <hr>The documentation for this class was generated from the following file:<ul>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1FileDS.html
 <li><a class="el" href="datasources_8h_source.html">datasources.h</a></ul>
 </div>
 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:48 2009 for mixpp by&nbsp;
+=======
+<li><a class="el" href="datasources_8h-source.html">datasources.h</a></ul>
+</div>
+<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_1FileDS.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>