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

Timestamp:

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

Author:

smidl

Message:

doc

Files:

• library/doc/html/functions_func_0x75.html (modified) (2 diffs)

library/doc/html/functions_func_0x75.html

@@ -107 +107 @@
 <li>UI()
 : <a class="el" href="classbdm_1_1UI.html#d60234c0673f345424329894b9b0cef8">bdm::UI</a>
+<<<<<<< HEAD:library/doc/html/functions_func_0x75.html
 <li>UIException()
 : <a class="el" href="classbdm_1_1UIException.html#351bfe4a6e8d0288500e3412313f3301">bdm::UIException</a>
@@ -114 +115 @@
 </div>
 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:47 2009 for mixpp by&nbsp;
+=======
+<li>UIFile()
+: <a class="el" href="classbdm_1_1UIFile.html#56b491cf846ddd6b47198ff67bbf87e4">bdm::UIFile</a>
+</ul>
+</div>
+<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_func_0x75.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>