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

Timestamp:

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

Author:

smidl

Message:

doc

Files:

• library/doc/html/codingrules.html (modified) (1 diff)

library/doc/html/codingrules.html

@@ -133 +133 @@
 <p>
 Explicit destructor functions are not required, unless they are needed. It shall not be possible to use any of the other member functions unless the class has been properly initiated with the input parameters. </div>
+<<<<<<< HEAD:library/doc/html/codingrules.html
 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:46 2009 for mixpp by&nbsp;
+=======
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jun 23 19:52:50 2009 for mixpp by&nbsp;
+>>>>>>> doc:library/doc/html/codingrules.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>