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

Timestamp:

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

Author:

smidl

Message:

doc

Files:

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

library/doc/html/timer.html

@@ -105 +105 @@
 The sum of all integers from 0 to 999999 equals 1783293664
 </pre></div> </div>
+<<<<<<< HEAD:library/doc/html/timer.html
 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:47 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/timer.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>