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/install.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<!-- 
     
    9999The default cmake configuration is looking for itpp in directory mac/itpp, make sure you have symlinks to this directory.<p> 
    100100If itpp compilation is successfull, you can run Cmake. Fill in the paths to your BDM directory, run Configure followed by Create. Configuration files for your favourite build environment should be created in the BDM directory. </div> 
    101 <<<<<<< HEAD:library/doc/html/install.html 
    102 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:46 2009 for mixpp by&nbsp; 
    103 ======= 
    104 <hr size="1"><address style="text-align: right;"><small>Generated on Tue Jun 23 19:52:50 2009 for mixpp by&nbsp; 
    105 >>>>>>> doc:library/doc/html/install.html 
     101<hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 21:53:05 2009 for mixpp by&nbsp; 
    106102<a href="http://www.doxygen.org/index.html"> 
    107 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.9 </small></address> 
     103<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address> 
    108104</body> 
    109105</html>