Show
Ignore:
Timestamp:
06/24/09 21:57:21 (16 years ago)
Author:
smidl
Message:

doc 2

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • library/doc/html/codingrules.html

    r397 r398  
    55<link href="doxygen.css" rel="stylesheet" type="text/css"> 
    66</head><body> 
    7 <!-- Generated by Doxygen 1.5.9 --> 
     7<!-- Generated by Doxygen 1.5.8 --> 
    88<script type="text/javascript"> 
    99<!-- 
     
    133133<p> 
    134134Explicit 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> 
    135 <<<<<<< HEAD:library/doc/html/codingrules.html 
    136 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:46 2009 for mixpp by&nbsp; 
    137 ======= 
    138 <hr size="1"><address style="text-align: right;"><small>Generated on Tue Jun 23 19:52:50 2009 for mixpp by&nbsp; 
    139 >>>>>>> doc:library/doc/html/codingrules.html 
     135<hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 21:53:05 2009 for mixpp by&nbsp; 
    140136<a href="http://www.doxygen.org/index.html"> 
    141 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.9 </small></address> 
     137<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address> 
    142138</body> 
    143139</html>